Adding New Isolated Timeout Test Class

sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/ContainerApiTests.java

@@ -59,7 +59,6 @@
 
 import java.io.ByteArrayInputStream;
 import java.net.URL;
-import java.time.Duration;
 import java.time.OffsetDateTime;
 import java.util.Arrays;
 import java.util.Base64;
@@ -1070,40 +1069,6 @@ public void listBlobsFlatError() {
         assertThrows(BlobStorageException.class, () -> cc.listBlobs().iterator().hasNext());
     }
 
-    @Test
-    public void listBlobsFlatWithTimeoutStillBackedByPagedStream() {
-        int numBlobs = 5;
-        int pageResults = 3;
-
-        for (int i = 0; i < numBlobs; i++) {
-            BlockBlobClient blob = cc.getBlobClient(generateBlobName()).getBlockBlobClient();
-            blob.upload(DATA.getDefaultInputStream(), DATA.getDefaultDataSize());
-        }
-
-        // when: "Consume results by page, then still have paging functionality"
-        assertDoesNotThrow(
-            () -> cc.listBlobs(new ListBlobsOptions().setMaxResultsPerPage(pageResults), Duration.ofSeconds(10))
-                .streamByPage()
-                .count());
-    }
-
-    @Test
-    public void listBlobsHierWithTimeoutStillBackedByPagedStream() {
-        int numBlobs = 5;
-        int pageResults = 3;
-
-        for (int i = 0; i < numBlobs; i++) {
-            BlockBlobClient blob = cc.getBlobClient(generateBlobName()).getBlockBlobClient();
-            blob.upload(DATA.getDefaultInputStream(), DATA.getDefaultDataSize());
-        }
-
-        // when: "Consume results by page, then still have paging functionality"
-        assertDoesNotThrow(() -> cc
-            .listBlobsByHierarchy("/", new ListBlobsOptions().setMaxResultsPerPage(pageResults), Duration.ofSeconds(10))
-            .streamByPage()
-            .count());
-    }
-
     /*
     This test requires two accounts that are configured in a very specific way. It is not feasible to setup that
     relationship programmatically, so we have recorded a successful interaction and only test recordings.
@@ -1656,28 +1621,6 @@ public void findBlobsError() {
         assertThrows(BlobStorageException.class, () -> cc.findBlobsByTags("garbageTag").streamByPage().count());
     }
 
-    @SuppressWarnings("deprecation")
-    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "2021-04-10")
-    @Test
-    public void findBlobsWithTimeoutStillBackedByPagedStream() {
-        int numBlobs = 5;
-        int pageResults = 3;
-        Map<String, String> tags = Collections.singletonMap(tagKey, tagValue);
-
-        for (int i = 0; i < numBlobs; i++) {
-            cc.getBlobClient(generateBlobName())
-                .uploadWithResponse(
-                    new BlobParallelUploadOptions(DATA.getDefaultInputStream(), DATA.getDefaultDataSize())
-                        .setTags(tags),
-                    null, null);
-        }
-
-        // when: "Consume results by page, still have paging functionality"
-        assertDoesNotThrow(() -> cc.findBlobsByTags(
-            new FindBlobsOptions(String.format("\"%s\"='%s'", tagKey, tagValue)).setMaxResultsPerPage(pageResults),
-            Duration.ofSeconds(10), Context.NONE).streamByPage().count());
-    }
-
     @ParameterizedTest
     @ValueSource(strings = { "中文", "az[]", "hello world", "hello/world", "hello&world", "!*'();:@&=+/$,/?#[]" })
     public void createURLSpecialChars(String name) {

sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/ContainerAsyncApiTests.java

@@ -1122,42 +1122,6 @@ public void listBlobsFlatError() {
         StepVerifier.create(ccAsync.listBlobs()).verifyError(BlobStorageException.class);
     }
 
-    @Test
-    public void listBlobsFlatWithTimeoutStillBackedByPagedFlux() {
-        int numBlobs = 5;
-        int pageResults = 3;
-
-        Mono<List<BlockBlobItem>> createBlob = Flux.range(0, numBlobs).flatMap(i -> {
-            BlockBlobAsyncClient blob = ccAsync.getBlobAsyncClient(generateBlobName()).getBlockBlobAsyncClient();
-            return blob.upload(DATA.getDefaultFlux(), DATA.getDefaultDataSize());
-        }).collectList();
-
-        // when: "Consume results by page, then still have paging functionality"
-        StepVerifier
-            .create(createBlob
-                .thenMany(ccAsync.listBlobs(new ListBlobsOptions().setMaxResultsPerPage(pageResults)).byPage()))
-            .expectNextCount(2)
-            .verifyComplete();
-    }
-
-    @Test
-    public void listBlobsHierWithTimeoutStillBackedByPagedFlux() {
-        int numBlobs = 5;
-        int pageResults = 3;
-
-        Mono<List<BlockBlobItem>> createBlob = Flux.range(0, numBlobs).flatMap(i -> {
-            BlockBlobAsyncClient blob = ccAsync.getBlobAsyncClient(generateBlobName()).getBlockBlobAsyncClient();
-            return blob.upload(DATA.getDefaultFlux(), DATA.getDefaultDataSize());
-        }).collectList();
-
-        // when: "Consume results by page, then still have paging functionality"
-        StepVerifier
-            .create(createBlob.thenMany(
-                ccAsync.listBlobsByHierarchy("/", new ListBlobsOptions().setMaxResultsPerPage(pageResults)).byPage()))
-            .expectNextCount(2)
-            .verifyComplete();
-    }
-
     /*
     This test requires two accounts that are configured in a very specific way. It is not feasible to setup that
     relationship programmatically, so we have recorded a successful interaction and only test recordings.
@@ -1776,35 +1740,6 @@ public void findBlobsError() {
         StepVerifier.create(ccAsync.findBlobsByTags("garbageTag").byPage()).verifyError(BlobStorageException.class);
     }
 
-    @SuppressWarnings("deprecation")
-    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "2021-04-10")
-    @Test
-    public void findBlobsWithTimeoutStillBackedByPagedFlux() {
-        int numBlobs = 5;
-        int pageResults = 3;
-        Map<String, String> tags = Collections.singletonMap(tagKey, tagValue);
-
-        Mono<List<Response<BlockBlobItem>>> uploadBlob = Flux.range(0, numBlobs)
-            .flatMap(i -> ccAsync.getBlobAsyncClient(generateBlobName())
-                .uploadWithResponse(
-                    new BlobParallelUploadOptions(DATA.getDefaultInputStream(), DATA.getDefaultDataSize())
-                        .setTags(tags)))
-            .collectList();
-
-        // when: "Consume results by page, still have paging functionality"
-        StepVerifier
-            .create(
-                uploadBlob
-                    .thenMany(
-                        ccAsync
-                            .findBlobsByTags(new FindBlobsOptions(String.format("\"%s\"='%s'", tagKey, tagValue))
-                                .setMaxResultsPerPage(pageResults), Duration.ofSeconds(10), Context.NONE)
-                            .byPage()
-                            .count()))
-            .expectNextCount(1)
-            .verifyComplete();
-    }
-
     @ParameterizedTest
     @ValueSource(strings = { "中文", "az[]", "hello world", "hello/world", "hello&world", "!*'();:@&=+/$,/?#[]" })
     public void createURLSpecialChars(String name) {

sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/ServiceApiTests.java

@@ -289,30 +289,6 @@ public void listContainersAnonymous() {
         assertThrows(IllegalStateException.class, () -> anonymousClient.listBlobContainers().iterator());
     }
 
-    @Test
-    public void listContainersWithTimeoutStillBackedByPagedStream() {
-        int numContainers = 5;
-        int pageResults = 3;
-
-        List<BlobContainerClient> containers = new ArrayList<>();
-        for (int i = 0; i < numContainers; i++) {
-            containers.add(primaryBlobServiceClient.createBlobContainer(generateContainerName()));
-        }
-
-        // when: "Consume results by page, then should still have paging functionality""
-        assertDoesNotThrow(
-            () -> primaryBlobServiceClient
-                .listBlobContainers(new ListBlobContainersOptions().setMaxResultsPerPage(pageResults),
-                    Duration.ofSeconds(10))
-                .streamByPage()
-                .count());
-
-        // cleanup:
-        for (BlobContainerClient container : containers) {
-            container.delete();
-        }
-    }
-
     @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "2020-10-02")
     @Test
     @ResourceLock("ServiceProperties")
@@ -525,32 +501,6 @@ public void findBlobsAnonymous() {
 
     }
 
-    @SuppressWarnings("deprecation")
-    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "2019-12-12")
-    @Test
-    public void findBlobsWithTimeoutStillBackedByPagedStream() {
-        int numBlobs = 5;
-        int pageResults = 3;
-        BlobContainerClient cc = primaryBlobServiceClient.createBlobContainer(generateContainerName());
-        Map<String, String> tags = Collections.singletonMap(tagKey, tagValue);
-
-        for (int i = 0; i < numBlobs; i++) {
-            cc.getBlobClient(generateBlobName())
-                .uploadWithResponse(
-                    new BlobParallelUploadOptions(DATA.getDefaultInputStream(), DATA.getDefaultDataSize())
-                        .setTags(tags),
-                    null, null);
-        }
-
-        // when: "Consume results by page, then still have paging functionality"
-        assertDoesNotThrow(() -> primaryBlobServiceClient.findBlobsByTags(
-            new FindBlobsOptions(String.format("\"%s\"='%s'", tagKey, tagValue)).setMaxResultsPerPage(pageResults),
-            Duration.ofSeconds(10), Context.NONE).streamByPage().count());
-
-        // cleanup:
-        cc.delete();
-    }
-
     private static void validatePropsSet(BlobServiceProperties sent, BlobServiceProperties received) {
         assertEquals(sent.getLogging().isRead(), received.getLogging().isRead());
         assertEquals(sent.getLogging().isWrite(), received.getLogging().isWrite());

sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/ServiceAsyncApiTests.java

@@ -285,22 +285,6 @@ public void listContainersAnonymous() {
         StepVerifier.create(anonymousClient.listBlobContainers()).verifyError(IllegalStateException.class);
     }
 
-    @Test
-    public void listContainersWithTimeoutStillBackedByPagedFlux() {
-        int numContainers = 5;
-        int pageResults = 3;
-
-        Mono<List<BlobContainerAsyncClient>> containersMono = Flux.range(0, numContainers)
-            .flatMap(i -> primaryBlobServiceAsyncClient.createBlobContainer(generateContainerName()))
-            .collectList();
-
-        StepVerifier.create(containersMono.flatMapMany(containers -> primaryBlobServiceAsyncClient
-            .listBlobContainersWithOptionalTimeout(new ListBlobContainersOptions().setMaxResultsPerPage(pageResults),
-                Duration.ofSeconds(10))
-            .byPage()
-            .count())).expectNextCount(1).verifyComplete();
-    }
-
     @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "2020-10-02")
     @Test
     @ResourceLock("ServiceProperties")
@@ -500,30 +484,6 @@ public void findBlobsAnonymous() {
         StepVerifier.create(anonymousClient.findBlobsByTags("foo=bar")).verifyError(IllegalStateException.class);
     }
 
-    @SuppressWarnings("deprecation")
-    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "2019-12-12")
-    @Test
-    public void findBlobsWithTimeoutStillBackedByPagedFlux() {
-        int numBlobs = 5;
-        int pageResults = 3;
-        Map<String, String> tags = Collections.singletonMap(tagKey, tagValue);
-
-        Mono<Long> response = primaryBlobServiceAsyncClient.createBlobContainer(generateContainerName()).flatMap(cc -> {
-            Flux<Response<BlockBlobItem>> upload = Flux.range(0, numBlobs)
-                .flatMap(i -> cc.getBlobAsyncClient(generateBlobName())
-                    .uploadWithResponse(
-                        new BlobParallelUploadOptions(DATA.getDefaultInputStream(), DATA.getDefaultDataSize())
-                            .setTags(tags)));
-            // when: "Consume results by page, then still have paging functionality"
-            return upload.then(primaryBlobServiceAsyncClient.findBlobsByTags(
-                new FindBlobsOptions(String.format("\"%s\"='%s'", tagKey, tagValue)).setMaxResultsPerPage(pageResults))
-                .byPage()
-                .count());
-        });
-
-        StepVerifier.create(response).expectNextCount(1).verifyComplete();
-    }
-
     private static void validatePropsSet(BlobServiceProperties sent, BlobServiceProperties received) {
         assertEquals(sent.getLogging().isRead(), received.getLogging().isRead());
         assertEquals(sent.getLogging().isWrite(), received.getLogging().isWrite());

sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/TimeoutAsyncTests.java

@@ -0,0 +1,112 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.storage.blob;
+
+import com.azure.core.test.utils.MockTokenCredential;
+import com.azure.core.util.Context;
+import com.azure.storage.blob.models.ListBlobContainersOptions;
+import com.azure.storage.blob.models.ListBlobsOptions;
+import com.azure.storage.blob.options.FindBlobsOptions;
+import com.azure.storage.common.test.shared.extensions.RequiredServiceVersion;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
+import reactor.test.StepVerifier;
+
+import java.time.Duration;
+
+@Isolated
+public class TimeoutAsyncTests {
+    /*
+     * This test class is marked as isolated to ensure that resource related issues do not interfere with the timeouts being tested.
+     *
+     * The custom http clients return a generic xml list of 5 blobs total.
+     * The api call should return 2 pages, one page of 3 blobs and one page of 2 blobs.
+     * Although each page is set to take 4 seconds to return, the timeout being set to 6 seconds should not cause the test to fail,
+     * as the timeout is only on the page request and not the entire stream of pages.
+     */
+
+    @Test
+    public void listBlobsFlatWithTimeoutStillBackedByPagedFlux() {
+        BlobContainerAsyncClient containerClient
+            = new BlobContainerClientBuilder().endpoint("https://account.blob.core.windows.net/")
+                .credential(new MockTokenCredential())
+                .containerName("foo")
+                .httpClient(new TimeoutTests.ListBlobsWithTimeoutTestClient())
+                .buildAsyncClient();
+
+        StepVerifier
+            .create(
+                containerClient
+                    .listBlobsFlatWithOptionalTimeout(new ListBlobsOptions().setMaxResultsPerPage(3), null,
+                        Duration.ofSeconds(6))
+                    .byPage())
+            .expectNextCount(2)
+            .verifyComplete();
+    }
+
+    @Test
+    public void listBlobsHierWithTimeoutStillBackedByPagedFlux() {
+        BlobContainerAsyncClient containerClient
+            = new BlobContainerClientBuilder().endpoint("https://account.blob.core.windows.net/")
+                .credential(new MockTokenCredential())
+                .containerName("foo")
+                .httpClient(new TimeoutTests.ListBlobsWithTimeoutTestClient())
+                .buildAsyncClient();
+
+        StepVerifier
+            .create(containerClient
+                .listBlobsHierarchyWithOptionalTimeout("/", new ListBlobsOptions().setMaxResultsPerPage(3),
+                    Duration.ofSeconds(6))
+                .byPage())
+            .expectNextCount(2)
+            .verifyComplete();
+    }
+
+    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "2021-04-10")
+    @Test
+    public void findBlobsInContainerWithTimeoutStillBackedByPagedFlux() {
+        BlobContainerAsyncClient containerClient
+            = new BlobContainerClientBuilder().endpoint("https://account.blob.core.windows.net/")
+                .credential(new MockTokenCredential())
+                .containerName("foo")
+                .httpClient(new TimeoutTests.FindBlobsWithTimeoutClient())
+                .buildAsyncClient();
+
+        StepVerifier.create(containerClient.findBlobsByTags(
+            new FindBlobsOptions(String.format("\"%s\"='%s'", "dummyKey", "dummyValue")).setMaxResultsPerPage(3),
+            Duration.ofSeconds(6), Context.NONE).byPage()).expectNextCount(2).verifyComplete();
+    }
+
+    @Test
+    public void listContainersWithTimeoutStillBackedByPagedFlux() {
+        BlobServiceAsyncClient serviceClient
+            = new BlobServiceClientBuilder().endpoint("https://account.blob.core.windows.net/")
+                .credential(new MockTokenCredential())
+                .httpClient(new TimeoutTests.ListContainersWithTimeoutTestClient())
+                .buildAsyncClient();
+
+        StepVerifier
+            .create(serviceClient
+                .listBlobContainersWithOptionalTimeout(new ListBlobContainersOptions().setMaxResultsPerPage(3),
+                    Duration.ofSeconds(6))
+                .byPage())
+            .expectNextCount(2)
+            .verifyComplete();
+    }
+
+    @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "2019-12-12")
+    @Test
+    public void findBlobsWithTimeoutStillBackedByPagedFlux() {
+        BlobServiceAsyncClient serviceClient
+            = new BlobServiceClientBuilder().endpoint("https://account.blob.core.windows.net/")
+                .credential(new MockTokenCredential())
+                .httpClient(new TimeoutTests.FindBlobsWithTimeoutClient())
+                .buildAsyncClient();
+
+        StepVerifier.create(serviceClient.findBlobsByTags(
+            new FindBlobsOptions(String.format("\"%s\"='%s'", "dummyKey", "dummyValue")).setMaxResultsPerPage(3),
+            Duration.ofSeconds(6), Context.NONE).byPage()).expectNextCount(2).verifyComplete();
+    }
+
+}