[Tables] Fix tables livetest #14797
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,6 +4,7 @@ | |
| package com.azure.data.tables; | ||
|
|
||
| import com.azure.core.http.HttpClient; | ||
| import com.azure.core.http.policy.ExponentialBackoff; | ||
| import com.azure.core.http.policy.HttpLogDetailLevel; | ||
| import com.azure.core.http.policy.HttpLogOptions; | ||
| import com.azure.core.http.policy.HttpPipelinePolicy; | ||
|
|
@@ -12,9 +13,10 @@ | |
| import com.azure.data.tables.models.ListEntitiesOptions; | ||
| import com.azure.data.tables.models.TableEntity; | ||
| import com.azure.data.tables.models.UpdateMode; | ||
| import org.junit.jupiter.api.AfterAll; | ||
| import org.junit.jupiter.api.BeforeAll; | ||
| import org.junit.jupiter.api.Tag; | ||
| import org.junit.jupiter.api.Test; | ||
| import reactor.test.StepVerifier; | ||
|
|
||
| import java.time.Duration; | ||
|
|
@@ -32,12 +34,22 @@ | |
| * Tests {@link TableAsyncClient}. | ||
| */ | ||
| public class TablesAsyncClientTest extends TestBase { | ||
| private static final Duration TIMEOUT = Duration.ofSeconds(100); | ||
|
|
||
| private TableAsyncClient tableClient; | ||
| private HttpPipelinePolicy recordPolicy; | ||
| private HttpClient playbackClient; | ||
|
|
||
| @BeforeAll | ||
| static void beforeAll() { | ||
| StepVerifier.setDefaultTimeout(TIMEOUT); | ||
| } | ||
|
|
||
| @AfterAll | ||
| static void afterAll() { | ||
| StepVerifier.resetDefaultTimeout(); | ||
| } | ||
|
|
||
| @Override | ||
| protected void beforeTest() { | ||
| final String tableName = testResourceNamer.randomName("tableName", 20); | ||
|
|
@@ -51,10 +63,13 @@ protected void beforeTest() { | |
| playbackClient = interceptorManager.getPlaybackClient(); | ||
| builder.httpClient(playbackClient); | ||
| } else { | ||
| builder.httpClient(HttpClient.createDefault()); | ||
| if (!interceptorManager.isLiveMode()) { | ||
| recordPolicy = interceptorManager.getRecordPolicy(); | ||
| builder.addPolicy(recordPolicy); | ||
| } | ||
| builder.addPolicy(new RetryPolicy(new ExponentialBackoff(6, Duration.ofMillis(1500), | ||
| Duration.ofSeconds(100)))); | ||
| } | ||
|
|
||
| tableClient = builder.buildAsyncClient(); | ||
|
|
@@ -74,15 +89,18 @@ void createTableAsync() { | |
| if (interceptorManager.isPlaybackMode()) { | ||
| builder.httpClient(playbackClient); | ||
| } else { | ||
| builder.httpClient(HttpClient.createDefault()); | ||
| if (!interceptorManager.isLiveMode()) { | ||
| builder.addPolicy(recordPolicy); | ||
| } | ||
| builder.addPolicy(new RetryPolicy(new ExponentialBackoff(6, Duration.ofMillis(1500), | ||
| Duration.ofSeconds(100)))); | ||
| } | ||
|
|
||
| final TableAsyncClient tableClient2 = builder.buildAsyncClient(); | ||
|
|
||
| // Act & Assert | ||
| StepVerifier.create(tableClient2.create()) | ||
| .expectComplete() | ||
| .verify(); | ||
| } | ||
|
|
@@ -100,16 +118,19 @@ void createTableWithResponseAsync() { | |
| if (interceptorManager.isPlaybackMode()) { | ||
| builder.httpClient(playbackClient); | ||
| } else { | ||
| builder.httpClient(HttpClient.createDefault()); | ||
| if (!interceptorManager.isLiveMode()) { | ||
| builder.addPolicy(recordPolicy); | ||
| } | ||
| builder.addPolicy(new RetryPolicy(new ExponentialBackoff(6, Duration.ofMillis(1500), | ||
| Duration.ofSeconds(100)))); | ||
| } | ||
|
|
||
| final TableAsyncClient tableClient2 = builder.buildAsyncClient(); | ||
| final int expectedStatusCode = 204; | ||
|
|
||
| // Act & Assert | ||
| StepVerifier.create(tableClient2.createWithResponse()) | ||
| .assertNext(response -> { | ||
| assertEquals(expectedStatusCode, response.getStatusCode()); | ||
| }) | ||
|
|
@@ -271,7 +292,8 @@ void deleteEntityWithResponseMatchETagAsync() { | |
| assertNotNull(createdEntity.getETag(), "'eTag' should not be null."); | ||
|
|
||
| // Act & Assert | ||
| StepVerifier.create(tableClient.deleteEntityWithResponse(partitionKeyValue, rowKeyValue, | ||
| createdEntity.getETag())) | ||
| .assertNext(response -> { | ||
| assertEquals(expectedStatusCode, response.getStatusCode()); | ||
| }) | ||
|
|
@@ -339,20 +361,27 @@ void updateEntityWithResponseAsync(UpdateMode mode) { | |
| createdEntity.getProperties().remove(oldPropertyKey); | ||
| createdEntity.addProperty(newPropertyKey, "valueB"); | ||
|
|
||
| // Act & Assert | ||
| if (mode == UpdateMode.MERGE && tableClient.getTableUrl().contains("cosmos.azure.com")) { | ||
| // This scenario is currently broken when using the CosmosDB Table API | ||
| StepVerifier.create(tableClient.updateEntityWithResponse(createdEntity, true, mode)) | ||
|
There was a problem hiding this comment. Can we split this into another test case and disable it? I feel it'll get lost as a comment since there is no issue or TODO tracking this. There was a problem hiding this comment. Yes, once support is merged for multiple tests with the same name (#14801) I will separate these into two test classes, one for Cosmos and one for Storage, each with their own recordings. There was a problem hiding this comment. Tracking this work in #14930 |
||
| .expectError(com.azure.data.tables.implementation.models.TableServiceErrorException.class) | ||
| .verify(); | ||
| } else { | ||
| StepVerifier.create(tableClient.updateEntityWithResponse(createdEntity, true, mode)) | ||
| .assertNext(response -> assertEquals(expectedStatusCode, response.getStatusCode())) | ||
| .expectComplete() | ||
| .verify(); | ||
|
|
||
| // Assert and verify that the new properties are in there. | ||
| StepVerifier.create(tableClient.getEntity(partitionKeyValue, rowKeyValue)) | ||
| .assertNext(entity -> { | ||
| final Map<String, Object> properties = entity.getProperties(); | ||
| assertTrue(properties.containsKey(newPropertyKey)); | ||
| assertEquals(expectOldProperty, properties.containsKey(oldPropertyKey)); | ||
| }) | ||
| .verifyComplete(); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
|
|
@@ -362,10 +391,8 @@ void listEntitiesAsync() { | |
| final String partitionKeyValue = testResourceNamer.randomName("partitionKey", 20); | ||
| final String rowKeyValue = testResourceNamer.randomName("rowKey", 20); | ||
| final String rowKeyValue2 = testResourceNamer.randomName("rowKey", 20); | ||
| tableClient.createEntity(new TableEntity(partitionKeyValue, rowKeyValue)).block(TIMEOUT); | ||
| tableClient.createEntity(new TableEntity(partitionKeyValue, rowKeyValue2)).block(TIMEOUT); | ||
|
|
||
| // Act & Assert | ||
| StepVerifier.create(tableClient.listEntities()) | ||
|
|
@@ -383,10 +410,8 @@ void listEntitiesWithFilterAsync() { | |
| final String rowKeyValue = testResourceNamer.randomName("rowKey", 20); | ||
| final String rowKeyValue2 = testResourceNamer.randomName("rowKey", 20); | ||
| ListEntitiesOptions options = new ListEntitiesOptions().setFilter("RowKey eq '" + rowKeyValue + "'"); | ||
| tableClient.createEntity(new TableEntity(partitionKeyValue, rowKeyValue)).block(TIMEOUT); | ||
| tableClient.createEntity(new TableEntity(partitionKeyValue, rowKeyValue2)).block(TIMEOUT); | ||
|
|
||
| // Act & Assert | ||
| StepVerifier.create(tableClient.listEntities(options)) | ||
|
|
@@ -434,11 +459,9 @@ void listEntitiesWithTopAsync() { | |
| final String rowKeyValue2 = testResourceNamer.randomName("rowKey", 20); | ||
| final String rowKeyValue3 = testResourceNamer.randomName("rowKey", 20); | ||
| ListEntitiesOptions options = new ListEntitiesOptions().setTop(2); | ||
| tableClient.createEntity(new TableEntity(partitionKeyValue, rowKeyValue)).block(TIMEOUT); | ||
| tableClient.createEntity(new TableEntity(partitionKeyValue, rowKeyValue2)).block(TIMEOUT); | ||
| tableClient.createEntity(new TableEntity(partitionKeyValue, rowKeyValue3)).block(TIMEOUT); | ||
|
|
||
| // Act & Assert | ||
| StepVerifier.create(tableClient.listEntities(options)) | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there a reason for splitting this into three sequential blocks rather than running them concurrently?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I was having intermittent 429 issues with failures when using
Mono.whenwith multiple streams against the CosmosDB API.