From f1cad3e71f5929b119b9fe86bb85e71a2c891096 Mon Sep 17 00:00:00 2001 From: Sofia Robles Sandoval Date: Fri, 13 Oct 2023 12:49:25 -0600 Subject: [PATCH 01/11] Fix area codes tests --- .../PhoneNumbersAsyncClientIntegrationTest.java | 6 ------ .../PhoneNumbersClientIntegrationTest.java | 15 +++++++++++---- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersAsyncClientIntegrationTest.java b/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersAsyncClientIntegrationTest.java index d830ea151eda..ae56fe47f0c0 100644 --- a/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersAsyncClientIntegrationTest.java +++ b/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersAsyncClientIntegrationTest.java @@ -258,9 +258,6 @@ public void getTollFreeAreaCodesWithAAD(HttpClient httpClient) { StepVerifier.create( this.getClientWithManagedIdentity(httpClient, "listAvailableTollFreeAreaCodes") .listAvailableTollFreeAreaCodes("US", PhoneNumberAssignmentType.APPLICATION).next()) - .assertNext((PhoneNumberAreaCode areaCodes) -> { - assertNotNull(areaCodes.getAreaCode()); - }) .verifyComplete(); } @@ -336,9 +333,6 @@ public void getTollFreeAreaCodes(HttpClient httpClient) { StepVerifier.create( this.getClientWithConnectionString(httpClient, "listAvailableTollFreeAreaCodes") .listAvailableTollFreeAreaCodes("US", PhoneNumberAssignmentType.APPLICATION).next()) - .assertNext((PhoneNumberAreaCode areaCodes) -> { - assertNotNull(areaCodes.getAreaCode()); - }) .verifyComplete(); } diff --git a/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersClientIntegrationTest.java b/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersClientIntegrationTest.java index de10eadd480b..aa551f2f0f11 100644 --- a/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersClientIntegrationTest.java +++ b/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersClientIntegrationTest.java @@ -30,9 +30,12 @@ import org.junit.jupiter.params.provider.MethodSource; import java.time.Duration; +import java.util.Arrays; +import java.util.stream.Stream; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; public class PhoneNumbersClientIntegrationTest extends PhoneNumbersIntegrationTestBase { @@ -181,8 +184,10 @@ public void getTollFreeAreaCodes(HttpClient httpClient) { PagedIterable areaCodesResult = this .getClientWithConnectionString(httpClient, "listAvailableTollFreeAreaCodes") .listAvailableTollFreeAreaCodes("US"); - PhoneNumberAreaCode areaCodes = areaCodesResult.iterator().next(); - assertNotNull(areaCodes); + String[] expectedAreaCodes = { "888", "877", "866", "855", "844", "800", "833", "88" }; + for (PhoneNumberAreaCode areaCode : areaCodesResult) { + assertTrue(Arrays.asList(expectedAreaCodes).contains(areaCode)); + } } @ParameterizedTest @@ -246,8 +251,10 @@ public void getTollFreeAreaCodesWithAAD(HttpClient httpClient) { PagedIterable areaCodesResult = this .getClientWithManagedIdentity(httpClient, "listAvailableTollFreeAreaCodes") .listAvailableTollFreeAreaCodes("US"); - PhoneNumberAreaCode areaCodes = areaCodesResult.iterator().next(); - assertNotNull(areaCodes); + String[] expectedAreaCodes = { "888", "877", "866", "855", "844", "800", "833", "88" }; + for (PhoneNumberAreaCode areaCode : areaCodesResult) { + assertTrue(Arrays.asList(expectedAreaCodes).contains(areaCode)); + } } @ParameterizedTest From 2ed28b1c25404647cbd13ca8ce56e8950652c471 Mon Sep 17 00:00:00 2001 From: Sofia Robles Sandoval Date: Fri, 13 Oct 2023 13:24:29 -0600 Subject: [PATCH 02/11] Format tests --- ...honeNumbersAsyncClientIntegrationTest.java | 168 ++-- .../PhoneNumbersClientIntegrationTest.java | 721 +++++++++--------- 2 files changed, 460 insertions(+), 429 deletions(-) diff --git a/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersAsyncClientIntegrationTest.java b/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersAsyncClientIntegrationTest.java index ae56fe47f0c0..7eb24fff838e 100644 --- a/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersAsyncClientIntegrationTest.java +++ b/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersAsyncClientIntegrationTest.java @@ -95,66 +95,65 @@ public void listPurchasedPhoneNumbers(HttpClient httpClient) { @MethodSource("com.azure.core.test.TestBase#getHttpClients") @DisabledIfEnvironmentVariable(named = "COMMUNICATION_SKIP_INT_PHONENUMBERS_TEST", matches = "(?i)(true)") public void beginSearchAvailablePhoneNumbers(HttpClient httpClient) { - PhoneNumbersAsyncClient client = - this.getClientWithConnectionString(httpClient, "beginSearchAvailablePhoneNumbers"); + PhoneNumbersAsyncClient client = this.getClientWithConnectionString(httpClient, + "beginSearchAvailablePhoneNumbers"); StepVerifier.create( - beginSearchAvailablePhoneNumbersHelper(client, true).last() - .flatMap((AsyncPollResponse result) -> { - return result.getFinalResult(); - })) - .assertNext((PhoneNumberSearchResult searchResult) -> { - assertEquals(searchResult.getPhoneNumbers().size(), 1); - assertNotNull(searchResult.getSearchId()); - }) - .verifyComplete(); + beginSearchAvailablePhoneNumbersHelper(client, true).last() + .flatMap((AsyncPollResponse result) -> { + return result.getFinalResult(); + })) + .assertNext((PhoneNumberSearchResult searchResult) -> { + assertEquals(searchResult.getPhoneNumbers().size(), 1); + assertNotNull(searchResult.getSearchId()); + }) + .verifyComplete(); } @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") @DisabledIfEnvironmentVariable(named = "COMMUNICATION_SKIP_INT_PHONENUMBERS_TEST", matches = "(?i)(true)") public void beginSearchAvailablePhoneNumbersWithoutOptions(HttpClient httpClient) { - PhoneNumbersAsyncClient client = - this.getClientWithConnectionString(httpClient, "getPurchasedPhoneNumberForCapabilities"); + PhoneNumbersAsyncClient client = this.getClientWithConnectionString(httpClient, + "getPurchasedPhoneNumberForCapabilities"); StepVerifier.create( - beginSearchAvailablePhoneNumbersHelper(client, false).last() - .flatMap((AsyncPollResponse result) -> { - return result.getFinalResult(); - })) - .assertNext((PhoneNumberSearchResult searchResult) -> { - assertEquals(searchResult.getPhoneNumbers().size(), 1); - assertNotNull(searchResult.getSearchId()); - }) - .verifyComplete(); + beginSearchAvailablePhoneNumbersHelper(client, false).last() + .flatMap((AsyncPollResponse result) -> { + return result.getFinalResult(); + })) + .assertNext((PhoneNumberSearchResult searchResult) -> { + assertEquals(searchResult.getPhoneNumbers().size(), 1); + assertNotNull(searchResult.getSearchId()); + }) + .verifyComplete(); } @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") @DisabledIfEnvironmentVariable(named = "SKIP_LIVE_TEST", matches = "(?i)(true)") public void beginPurchaseandReleasePhoneNumbers(HttpClient httpClient) { - PhoneNumbersAsyncClient client = - this.getClientWithConnectionString(httpClient, "getPurchasedPhoneNumberForCapabilities"); + PhoneNumbersAsyncClient client = this.getClientWithConnectionString(httpClient, + "getPurchasedPhoneNumberForCapabilities"); StepVerifier.create( - beginSearchAvailablePhoneNumbersHelper(client, true).last() - .flatMap((AsyncPollResponse result) -> { - return result.getFinalResult() - .flatMap((PhoneNumberSearchResult searchResult) -> { - String phoneNumber = searchResult.getPhoneNumbers().get(0); - return beginPurchasePhoneNumbersHelper(client, searchResult.getSearchId() - ).last() - .flatMap(( - AsyncPollResponse purchaseResult) -> { - assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, - purchaseResult.getStatus()); - return beginReleasePhoneNumberHelper(client, phoneNumber - ).last(); - }); - }); - })) - .assertNext((AsyncPollResponse releaseResult) -> { - assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, releaseResult.getStatus()); - - }) - .verifyComplete(); + beginSearchAvailablePhoneNumbersHelper(client, true).last() + .flatMap((AsyncPollResponse result) -> { + return result.getFinalResult() + .flatMap((PhoneNumberSearchResult searchResult) -> { + String phoneNumber = searchResult.getPhoneNumbers().get(0); + return beginPurchasePhoneNumbersHelper(client, searchResult.getSearchId()) + .last() + .flatMap(( + AsyncPollResponse purchaseResult) -> { + assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, + purchaseResult.getStatus()); + return beginReleasePhoneNumberHelper(client, phoneNumber).last(); + }); + }); + })) + .assertNext((AsyncPollResponse releaseResult) -> { + assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, releaseResult.getStatus()); + + }) + .verifyComplete(); } @ParameterizedTest @@ -163,32 +162,32 @@ public void beginPurchaseandReleasePhoneNumbers(HttpClient httpClient) { @DisabledIfEnvironmentVariable(named = "SKIP_UPDATE_CAPABILITIES_LIVE_TESTS", matches = "(?i)(true)") public void beginUpdatePhoneNumberCapabilities(HttpClient httpClient) { String phoneNumber = getTestPhoneNumber(); - PhoneNumbersAsyncClient client = - this.getClientWithConnectionString(httpClient, "getPurchasedPhoneNumberForCapabilities"); + PhoneNumbersAsyncClient client = this.getClientWithConnectionString(httpClient, + "getPurchasedPhoneNumberForCapabilities"); StepVerifier.create( - client.getPurchasedPhoneNumberWithResponse(phoneNumber) - .flatMap(responseAcquiredPhone -> { - PhoneNumberCapabilities capabilities = new PhoneNumberCapabilities(); - capabilities.setCalling(responseAcquiredPhone.getValue().getCapabilities() - .getCalling() == PhoneNumberCapabilityType.INBOUND - ? PhoneNumberCapabilityType.OUTBOUND - : PhoneNumberCapabilityType.INBOUND); - capabilities.setSms(responseAcquiredPhone.getValue().getCapabilities() - .getSms() == PhoneNumberCapabilityType.INBOUND_OUTBOUND - ? PhoneNumberCapabilityType.OUTBOUND - : PhoneNumberCapabilityType.INBOUND_OUTBOUND); - return beginUpdatePhoneNumberCapabilitiesHelper(client, phoneNumber, capabilities) - .last() - .flatMap((AsyncPollResponse result) -> { - assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, - result.getStatus()); - assertEquals(PhoneNumberOperationStatus.SUCCEEDED, - result.getValue().getStatus()); - return result.getFinalResult(); - }); - })) - .assertNext(Assertions::assertNotNull) - .verifyComplete(); + client.getPurchasedPhoneNumberWithResponse(phoneNumber) + .flatMap(responseAcquiredPhone -> { + PhoneNumberCapabilities capabilities = new PhoneNumberCapabilities(); + capabilities.setCalling(responseAcquiredPhone.getValue().getCapabilities() + .getCalling() == PhoneNumberCapabilityType.INBOUND + ? PhoneNumberCapabilityType.OUTBOUND + : PhoneNumberCapabilityType.INBOUND); + capabilities.setSms(responseAcquiredPhone.getValue().getCapabilities() + .getSms() == PhoneNumberCapabilityType.INBOUND_OUTBOUND + ? PhoneNumberCapabilityType.OUTBOUND + : PhoneNumberCapabilityType.INBOUND_OUTBOUND); + return beginUpdatePhoneNumberCapabilitiesHelper(client, phoneNumber, capabilities) + .last() + .flatMap((AsyncPollResponse result) -> { + assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, + result.getStatus()); + assertEquals(PhoneNumberOperationStatus.SUCCEEDED, + result.getValue().getStatus()); + return result.getFinalResult(); + }); + })) + .assertNext(Assertions::assertNotNull) + .verifyComplete(); } @ParameterizedTest @@ -234,10 +233,10 @@ public void beginUpdatePhoneNumberCapabilitiesUnauthorizedPhoneNumber(HttpClient PhoneNumberCapabilities capabilities = new PhoneNumberCapabilities(); capabilities.setCalling(PhoneNumberCapabilityType.INBOUND); StepVerifier.create( - this.getClientWithConnectionString(httpClient, "beginUpdatePhoneNumberCapabilitiesUnauthorizedPhoneNumber") - .beginUpdatePhoneNumberCapabilities("+14255555111", capabilities) - ) - .verifyError(); + this.getClientWithConnectionString(httpClient, + "beginUpdatePhoneNumberCapabilitiesUnauthorizedPhoneNumber") + .beginUpdatePhoneNumberCapabilities("+14255555111", capabilities)) + .verifyError(); } @ParameterizedTest @@ -246,10 +245,9 @@ public void beginUpdatePhoneNumberCapabilitiesInvalidPhoneNumber(HttpClient http PhoneNumberCapabilities capabilities = new PhoneNumberCapabilities(); capabilities.setCalling(PhoneNumberCapabilityType.INBOUND); StepVerifier.create( - this.getClientWithConnectionString(httpClient, "beginUpdatePhoneNumberCapabilitiesInvalidPhoneNumber") - .beginUpdatePhoneNumberCapabilities("invalid-phone-number", capabilities) - ) - .verifyError(); + this.getClientWithConnectionString(httpClient, "beginUpdatePhoneNumberCapabilitiesInvalidPhoneNumber") + .beginUpdatePhoneNumberCapabilities("invalid-phone-number", capabilities)) + .verifyError(); } @ParameterizedTest @@ -307,10 +305,12 @@ public void getLocalitiesAdministrativeDivisionWithAAD(HttpClient httpClient) { .listAvailableLocalities("US", null).blockFirst(); StepVerifier.create( this.getClientWithManagedIdentity(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", locality.getAdministrativeDivision().getAbbreviatedName()).next()) + .listAvailableLocalities("US", locality.getAdministrativeDivision().getAbbreviatedName()) + .next()) .assertNext((PhoneNumberLocality localityWithAD) -> { assertNotNull(localityWithAD); - assertEquals(localityWithAD.getAdministrativeDivision().getAbbreviatedName(), locality.getAdministrativeDivision().getAbbreviatedName()); + assertEquals(localityWithAD.getAdministrativeDivision().getAbbreviatedName(), + locality.getAdministrativeDivision().getAbbreviatedName()); }) .verifyComplete(); } @@ -405,7 +405,7 @@ public void getOfferings(HttpClient httpClient) { } private PollerFlux beginSearchAvailablePhoneNumbersHelper( - PhoneNumbersAsyncClient client, boolean withOptions) { + PhoneNumbersAsyncClient client, boolean withOptions) { PhoneNumberCapabilities capabilities = new PhoneNumberCapabilities(); capabilities.setCalling(PhoneNumberCapabilityType.INBOUND); capabilities.setSms(PhoneNumberCapabilityType.INBOUND_OUTBOUND); @@ -429,19 +429,19 @@ private PollerFlux beginSearchAva } private PollerFlux beginPurchasePhoneNumbersHelper( - PhoneNumbersAsyncClient client, String searchId) { + PhoneNumbersAsyncClient client, String searchId) { return setPollInterval(client .beginPurchasePhoneNumbers(searchId)); } private PollerFlux beginReleasePhoneNumberHelper( - PhoneNumbersAsyncClient client, String phoneNumber) { + PhoneNumbersAsyncClient client, String phoneNumber) { return setPollInterval(client .beginReleasePhoneNumber(phoneNumber)); } private PollerFlux beginUpdatePhoneNumberCapabilitiesHelper( - PhoneNumbersAsyncClient client, String phoneNumber, PhoneNumberCapabilities capabilities) { + PhoneNumbersAsyncClient client, String phoneNumber, PhoneNumberCapabilities capabilities) { return setPollInterval(client .beginUpdatePhoneNumberCapabilities(phoneNumber, capabilities)); diff --git a/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersClientIntegrationTest.java b/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersClientIntegrationTest.java index aa551f2f0f11..5c6cfaa23ea2 100644 --- a/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersClientIntegrationTest.java +++ b/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersClientIntegrationTest.java @@ -40,359 +40,390 @@ public class PhoneNumbersClientIntegrationTest extends PhoneNumbersIntegrationTestBase { - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getPurchasedPhoneNumber(HttpClient httpClient) { - String phoneNumber = redactIfPlaybackMode(getTestPhoneNumber()); - PurchasedPhoneNumber number = this.getClientWithConnectionString(httpClient, "getPurchasedPhoneNumberSync") - .getPurchasedPhoneNumber(phoneNumber); - assertEquals(phoneNumber, number.getPhoneNumber()); - assertEquals(COUNTRY_CODE, number.getCountryCode()); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getPurchasedPhoneNumberWithAAD(HttpClient httpClient) { - String phoneNumber = redactIfPlaybackMode(getTestPhoneNumber()); - PurchasedPhoneNumber number = this - .getClientWithManagedIdentity(httpClient, "getPurchasedPhoneNumberWithAADSync") - .getPurchasedPhoneNumber(phoneNumber); - assertEquals(phoneNumber, number.getPhoneNumber()); - assertEquals(COUNTRY_CODE, number.getCountryCode()); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getPurchasedPhoneNumberWithResponse(HttpClient httpClient) { - String phoneNumber = redactIfPlaybackMode(getTestPhoneNumber()); - Response response = this - .getClientWithConnectionString(httpClient, "getPurchasedPhoneNumberWithResponseSync") - .getPurchasedPhoneNumberWithResponse(phoneNumber, Context.NONE); - PurchasedPhoneNumber number = response.getValue(); - assertEquals(200, response.getStatusCode()); - assertEquals(phoneNumber, number.getPhoneNumber()); - assertEquals(COUNTRY_CODE, number.getCountryCode()); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void listPurchasedPhoneNumbers(HttpClient httpClient) { - PagedIterable numbers = this - .getClientWithConnectionString(httpClient, "listPurchasedPhoneNumbersSync") - .listPurchasedPhoneNumbers(Context.NONE); - PurchasedPhoneNumber number = numbers.iterator().next(); - assertNotNull(number.getPhoneNumber()); - assertEquals(COUNTRY_CODE, number.getCountryCode()); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void listPurchasedPhoneNumbersWithoutContext(HttpClient httpClient) { - PagedIterable numbers = this - .getClientWithConnectionString(httpClient, "listPurchasedPhoneNumbersSync").listPurchasedPhoneNumbers(); - PurchasedPhoneNumber number = numbers.iterator().next(); - assertNotNull(number.getPhoneNumber()); - assertEquals(COUNTRY_CODE, number.getCountryCode()); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable(named = "COMMUNICATION_SKIP_INT_PHONENUMBERS_TEST", matches = "(?i)(true)") - public void beginSearchAvailablePhoneNumbers(HttpClient httpClient) { - SyncPoller poller = beginSearchAvailablePhoneNumbersHelper( - httpClient, "beginSearchAvailablePhoneNumbersSync", true); - PollResponse response = poller.waitForCompletion(); - if (LongRunningOperationStatus.SUCCESSFULLY_COMPLETED == response.getStatus()) { - PhoneNumberSearchResult searchResult = poller.getFinalResult(); - assertEquals(searchResult.getPhoneNumbers().size(), 1); - assertNotNull(searchResult.getSearchId()); - } else { - fail("Long Running Operation Status was not successfully completed"); + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getPurchasedPhoneNumber(HttpClient httpClient) { + String phoneNumber = redactIfPlaybackMode(getTestPhoneNumber()); + PurchasedPhoneNumber number = this + .getClientWithConnectionString(httpClient, "getPurchasedPhoneNumberSync") + .getPurchasedPhoneNumber(phoneNumber); + assertEquals(phoneNumber, number.getPhoneNumber()); + assertEquals(COUNTRY_CODE, number.getCountryCode()); } - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable(named = "SKIP_LIVE_TEST", matches = "(?i)(true)") - public void beginPurchaseandReleasePhoneNumbersWithoutContext(HttpClient httpClient) { - SyncPoller poller = beginSearchAvailablePhoneNumbersHelper( - httpClient, "beginPurchaseandReleasePhoneNumbers_beginSearchAvailablePhoneNumbersWithoutContextSync", - false); - PollResponse response = poller.waitForCompletion(); - if (LongRunningOperationStatus.SUCCESSFULLY_COMPLETED == response.getStatus()) { - PhoneNumberSearchResult searchResult = poller.getFinalResult(); - String phoneNumber = searchResult.getPhoneNumbers().get(0); - PollResponse purchaseOperationResponse = beginPurchasePhoneNumbersHelper(httpClient, - searchResult.getSearchId(), "beginPurchasePhoneNumbersWithoutContextSync", false) - .waitForCompletion(); - assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, purchaseOperationResponse.getStatus()); - PollResponse releaseOperationResponse = beginReleasePhoneNumberHelper(httpClient, - phoneNumber, "beginReleasePhoneNumberWithoutContextSync", false).waitForCompletion(); - assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, releaseOperationResponse.getStatus()); - } else { - fail("Long Running Operation Status was not successfully completed"); + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getPurchasedPhoneNumberWithAAD(HttpClient httpClient) { + String phoneNumber = redactIfPlaybackMode(getTestPhoneNumber()); + PurchasedPhoneNumber number = this + .getClientWithManagedIdentity(httpClient, "getPurchasedPhoneNumberWithAADSync") + .getPurchasedPhoneNumber(phoneNumber); + assertEquals(phoneNumber, number.getPhoneNumber()); + assertEquals(COUNTRY_CODE, number.getCountryCode()); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getPurchasedPhoneNumberWithResponse(HttpClient httpClient) { + String phoneNumber = redactIfPlaybackMode(getTestPhoneNumber()); + Response response = this + .getClientWithConnectionString(httpClient, "getPurchasedPhoneNumberWithResponseSync") + .getPurchasedPhoneNumberWithResponse(phoneNumber, Context.NONE); + PurchasedPhoneNumber number = response.getValue(); + assertEquals(200, response.getStatusCode()); + assertEquals(phoneNumber, number.getPhoneNumber()); + assertEquals(COUNTRY_CODE, number.getCountryCode()); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void listPurchasedPhoneNumbers(HttpClient httpClient) { + PagedIterable numbers = this + .getClientWithConnectionString(httpClient, "listPurchasedPhoneNumbersSync") + .listPurchasedPhoneNumbers(Context.NONE); + PurchasedPhoneNumber number = numbers.iterator().next(); + assertNotNull(number.getPhoneNumber()); + assertEquals(COUNTRY_CODE, number.getCountryCode()); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void listPurchasedPhoneNumbersWithoutContext(HttpClient httpClient) { + PagedIterable numbers = this + .getClientWithConnectionString(httpClient, "listPurchasedPhoneNumbersSync") + .listPurchasedPhoneNumbers(); + PurchasedPhoneNumber number = numbers.iterator().next(); + assertNotNull(number.getPhoneNumber()); + assertEquals(COUNTRY_CODE, number.getCountryCode()); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable(named = "COMMUNICATION_SKIP_INT_PHONENUMBERS_TEST", matches = "(?i)(true)") + public void beginSearchAvailablePhoneNumbers(HttpClient httpClient) { + SyncPoller poller = beginSearchAvailablePhoneNumbersHelper( + httpClient, "beginSearchAvailablePhoneNumbersSync", true); + PollResponse response = poller.waitForCompletion(); + if (LongRunningOperationStatus.SUCCESSFULLY_COMPLETED == response.getStatus()) { + PhoneNumberSearchResult searchResult = poller.getFinalResult(); + assertEquals(searchResult.getPhoneNumbers().size(), 1); + assertNotNull(searchResult.getSearchId()); + } else { + fail("Long Running Operation Status was not successfully completed"); + } + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable(named = "SKIP_LIVE_TEST", matches = "(?i)(true)") + public void beginPurchaseandReleasePhoneNumbersWithoutContext(HttpClient httpClient) { + SyncPoller poller = beginSearchAvailablePhoneNumbersHelper( + httpClient, + "beginPurchaseandReleasePhoneNumbers_beginSearchAvailablePhoneNumbersWithoutContextSync", + false); + PollResponse response = poller.waitForCompletion(); + if (LongRunningOperationStatus.SUCCESSFULLY_COMPLETED == response.getStatus()) { + PhoneNumberSearchResult searchResult = poller.getFinalResult(); + String phoneNumber = searchResult.getPhoneNumbers().get(0); + PollResponse purchaseOperationResponse = beginPurchasePhoneNumbersHelper( + httpClient, + searchResult.getSearchId(), "beginPurchasePhoneNumbersWithoutContextSync", + false) + .waitForCompletion(); + assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, + purchaseOperationResponse.getStatus()); + PollResponse releaseOperationResponse = beginReleasePhoneNumberHelper( + httpClient, + phoneNumber, "beginReleasePhoneNumberWithoutContextSync", false) + .waitForCompletion(); + assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, + releaseOperationResponse.getStatus()); + } else { + fail("Long Running Operation Status was not successfully completed"); + } + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable(named = "SKIP_LIVE_TEST", matches = "(?i)(true)") + public void beginPurchaseandReleasePhoneNumbers(HttpClient httpClient) { + SyncPoller poller = beginSearchAvailablePhoneNumbersHelper( + httpClient, "beginPurchaseandReleasePhoneNumbers_beginSearchAvailablePhoneNumbersSync", + true); + PollResponse response = poller.waitForCompletion(); + if (LongRunningOperationStatus.SUCCESSFULLY_COMPLETED == response.getStatus()) { + PhoneNumberSearchResult searchResult = poller.getFinalResult(); + String phoneNumber = searchResult.getPhoneNumbers().get(0); + PollResponse purchaseOperationResponse = beginPurchasePhoneNumbersHelper( + httpClient, + searchResult.getSearchId(), "beginPurchasePhoneNumbersSync", true) + .waitForCompletion(); + assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, + purchaseOperationResponse.getStatus()); + PollResponse releaseOperationResponse = beginReleasePhoneNumberHelper( + httpClient, + phoneNumber, "beginReleasePhoneNumberSync", true).waitForCompletion(); + assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, + releaseOperationResponse.getStatus()); + } else { + fail("Long Running Operation Status was not successfully completed"); + } + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable(named = "COMMUNICATION_SKIP_INT_PHONENUMBERS_TEST", matches = "(?i)(true)") + public void beginUpdatePhoneNumberCapabilitiesWithoutContext(HttpClient httpClient) { + String phoneNumber = getTestPhoneNumber(); + PollResponse result = beginUpdatePhoneNumberCapabilitiesHelper(httpClient, + phoneNumber, + "beginUpdatePhoneNumberCapabilitiesWithoutContextSync", false).waitForCompletion(); + assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, result.getStatus()); + assertEquals(PhoneNumberOperationStatus.SUCCEEDED, result.getValue().getStatus()); } - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable(named = "SKIP_LIVE_TEST", matches = "(?i)(true)") - public void beginPurchaseandReleasePhoneNumbers(HttpClient httpClient) { - SyncPoller poller = beginSearchAvailablePhoneNumbersHelper( - httpClient, "beginPurchaseandReleasePhoneNumbers_beginSearchAvailablePhoneNumbersSync", true); - PollResponse response = poller.waitForCompletion(); - if (LongRunningOperationStatus.SUCCESSFULLY_COMPLETED == response.getStatus()) { - PhoneNumberSearchResult searchResult = poller.getFinalResult(); - String phoneNumber = searchResult.getPhoneNumbers().get(0); - PollResponse purchaseOperationResponse = beginPurchasePhoneNumbersHelper(httpClient, - searchResult.getSearchId(), "beginPurchasePhoneNumbersSync", true).waitForCompletion(); - assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, purchaseOperationResponse.getStatus()); - PollResponse releaseOperationResponse = beginReleasePhoneNumberHelper(httpClient, - phoneNumber, "beginReleasePhoneNumberSync", true).waitForCompletion(); - assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, releaseOperationResponse.getStatus()); - } else { - fail("Long Running Operation Status was not successfully completed"); + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable(named = "COMMUNICATION_SKIP_INT_PHONENUMBERS_TEST", matches = "(?i)(true)") + @DisabledIfEnvironmentVariable(named = "SKIP_UPDATE_CAPABILITIES_LIVE_TESTS", matches = "(?i)(true)") + public void beginUpdatePhoneNumberCapabilities(HttpClient httpClient) { + String phoneNumber = getTestPhoneNumber(); + PollResponse result = beginUpdatePhoneNumberCapabilitiesHelper(httpClient, + phoneNumber, + "beginUpdatePhoneNumberCapabilities", true).waitForCompletion(); + assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, result.getStatus()); + assertEquals(PhoneNumberOperationStatus.SUCCEEDED, result.getValue().getStatus()); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getTollFreeAreaCodes(HttpClient httpClient) { + PagedIterable areaCodesResult = this + .getClientWithConnectionString(httpClient, "listAvailableTollFreeAreaCodes") + .listAvailableTollFreeAreaCodes("US"); + String[] expectedAreaCodes = { "888", "877", "866", "855", "844", "800", "833", "88" }; + for (PhoneNumberAreaCode areaCode : areaCodesResult) { + assertTrue(Arrays.asList(expectedAreaCodes).contains(areaCode)); + } } - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable(named = "COMMUNICATION_SKIP_INT_PHONENUMBERS_TEST", matches = "(?i)(true)") - public void beginUpdatePhoneNumberCapabilitiesWithoutContext(HttpClient httpClient) { - String phoneNumber = getTestPhoneNumber(); - PollResponse result = beginUpdatePhoneNumberCapabilitiesHelper(httpClient, phoneNumber, - "beginUpdatePhoneNumberCapabilitiesWithoutContextSync", false).waitForCompletion(); - assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, result.getStatus()); - assertEquals(PhoneNumberOperationStatus.SUCCEEDED, result.getValue().getStatus()); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable(named = "COMMUNICATION_SKIP_INT_PHONENUMBERS_TEST", matches = "(?i)(true)") - @DisabledIfEnvironmentVariable(named = "SKIP_UPDATE_CAPABILITIES_LIVE_TESTS", matches = "(?i)(true)") - public void beginUpdatePhoneNumberCapabilities(HttpClient httpClient) { - String phoneNumber = getTestPhoneNumber(); - PollResponse result = beginUpdatePhoneNumberCapabilitiesHelper(httpClient, phoneNumber, - "beginUpdatePhoneNumberCapabilities", true).waitForCompletion(); - assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, result.getStatus()); - assertEquals(PhoneNumberOperationStatus.SUCCEEDED, result.getValue().getStatus()); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getTollFreeAreaCodes(HttpClient httpClient) { - PagedIterable areaCodesResult = this - .getClientWithConnectionString(httpClient, "listAvailableTollFreeAreaCodes") - .listAvailableTollFreeAreaCodes("US"); - String[] expectedAreaCodes = { "888", "877", "866", "855", "844", "800", "833", "88" }; - for (PhoneNumberAreaCode areaCode : areaCodesResult) { - assertTrue(Arrays.asList(expectedAreaCodes).contains(areaCode)); + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getGeographicAreaCodes(HttpClient httpClient) { + PhoneNumberLocality locality = this.getClientWithConnectionString(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", null).iterator().next(); + PagedIterable areaCodesResult = this + .getClientWithConnectionString(httpClient, "listAvailableGeographicAreaCodes") + .listAvailableGeographicAreaCodes("US", PhoneNumberAssignmentType.PERSON, + locality.getLocalizedName(), + locality.getAdministrativeDivision().getAbbreviatedName()); + PhoneNumberAreaCode areaCodes = areaCodesResult.iterator().next(); + assertNotNull(areaCodes); } - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getGeographicAreaCodes(HttpClient httpClient) { - PhoneNumberLocality locality = this.getClientWithConnectionString(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", null).iterator().next(); - PagedIterable areaCodesResult = this - .getClientWithConnectionString(httpClient, "listAvailableGeographicAreaCodes") - .listAvailableGeographicAreaCodes("US", PhoneNumberAssignmentType.PERSON, locality.getLocalizedName(), - locality.getAdministrativeDivision().getAbbreviatedName()); - PhoneNumberAreaCode areaCodes = areaCodesResult.iterator().next(); - assertNotNull(areaCodes); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getCountries(HttpClient httpClient) { - PagedIterable countriesResult = this - .getClientWithConnectionString(httpClient, "listAvailableCountries").listAvailableCountries(); - PhoneNumberCountry country = countriesResult.iterator().next(); - assertNotNull(country); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getLocalities(HttpClient httpClient) { - PagedIterable localitiesResult = this - .getClientWithConnectionString(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", null); - PhoneNumberLocality locality = localitiesResult.iterator().next(); - assertNotNull(locality); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getLocalitiesWithAdministrativeDivision(HttpClient httpClient) { - String localityAdministraiveDivision = this.getClientWithConnectionString(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", null).iterator().next().getAdministrativeDivision().getAbbreviatedName(); - PagedIterable localitiesResult = this - .getClientWithConnectionString(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", localityAdministraiveDivision); - PhoneNumberLocality locality = localitiesResult.iterator().next(); - assertNotNull(locality); - assertEquals(locality.getAdministrativeDivision().getAbbreviatedName(), localityAdministraiveDivision); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getOfferings(HttpClient httpClient) { - PagedIterable offeringsResult = this - .getClientWithConnectionString(httpClient, "listAvailableOfferings") - .listAvailableOfferings("US", null, null); - PhoneNumberOffering offering = offeringsResult.iterator().next(); - assertNotNull(offering); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getTollFreeAreaCodesWithAAD(HttpClient httpClient) { - PagedIterable areaCodesResult = this - .getClientWithManagedIdentity(httpClient, "listAvailableTollFreeAreaCodes") - .listAvailableTollFreeAreaCodes("US"); - String[] expectedAreaCodes = { "888", "877", "866", "855", "844", "800", "833", "88" }; - for (PhoneNumberAreaCode areaCode : areaCodesResult) { - assertTrue(Arrays.asList(expectedAreaCodes).contains(areaCode)); + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getCountries(HttpClient httpClient) { + PagedIterable countriesResult = this + .getClientWithConnectionString(httpClient, "listAvailableCountries") + .listAvailableCountries(); + PhoneNumberCountry country = countriesResult.iterator().next(); + assertNotNull(country); } - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getGeographicAreaCodesWithAAD(HttpClient httpClient) { - PhoneNumberLocality locality = this.getClientWithConnectionString(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", null).iterator().next(); - PagedIterable areaCodesResult = this - .getClientWithManagedIdentity(httpClient, "listAvailableGeographicAreaCodes") - .listAvailableGeographicAreaCodes("US", PhoneNumberAssignmentType.PERSON, locality.getLocalizedName(), - locality.getAdministrativeDivision().getAbbreviatedName()); - PhoneNumberAreaCode areaCodes = areaCodesResult.iterator().next(); - assertNotNull(areaCodes); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getCountriesWithAAD(HttpClient httpClient) { - PagedIterable countriesResult = this - .getClientWithManagedIdentity(httpClient, "listAvailableCountries").listAvailableCountries(); - PhoneNumberCountry country = countriesResult.iterator().next(); - assertNotNull(country); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getLocalitiesWithAAD(HttpClient httpClient) { - PagedIterable localitiesResult = this - .getClientWithManagedIdentity(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", null); - PhoneNumberLocality locality = localitiesResult.iterator().next(); - assertNotNull(locality); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getLocalitiesWithAdministrativeDivisionWithAAD(HttpClient httpClient) { - PagedIterable localities = this - .getClientWithManagedIdentity(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", null); - PhoneNumberLocality localityWithAD = localities.iterator().next(); - - PagedIterable localitiesResult = this - .getClientWithManagedIdentity(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", localityWithAD.getAdministrativeDivision().getAbbreviatedName()); - PhoneNumberLocality locality = localitiesResult.iterator().next(); - assertNotNull(locality); - assertEquals(locality.getAdministrativeDivision().getAbbreviatedName(), localityWithAD.getAdministrativeDivision().getAbbreviatedName()); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getOfferingsWithAAD(HttpClient httpClient) { - PagedIterable offeringsResult = this - .getClientWithManagedIdentity(httpClient, "listAvailableOfferings") - .listAvailableOfferings("US", null, null); - PhoneNumberOffering offering = offeringsResult.iterator().next(); - assertNotNull(offering); - } - - private SyncPoller beginSearchAvailablePhoneNumbersHelper( - HttpClient httpClient, String testName, boolean withContext) { - PhoneNumberCapabilities capabilities = new PhoneNumberCapabilities(); - capabilities.setCalling(PhoneNumberCapabilityType.INBOUND); - capabilities.setSms(PhoneNumberCapabilityType.INBOUND_OUTBOUND); - PhoneNumberSearchOptions searchOptions = new PhoneNumberSearchOptions().setQuantity(1); - - if (withContext) { - return setPollInterval(getClientWithConnectionString(httpClient, testName).beginSearchAvailablePhoneNumbers( - COUNTRY_CODE, - PhoneNumberType.TOLL_FREE, - PhoneNumberAssignmentType.APPLICATION, - capabilities, - searchOptions, - Context.NONE)); + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getLocalities(HttpClient httpClient) { + PagedIterable localitiesResult = this + .getClientWithConnectionString(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", null); + PhoneNumberLocality locality = localitiesResult.iterator().next(); + assertNotNull(locality); } - return setPollInterval(getClientWithConnectionString(httpClient, testName).beginSearchAvailablePhoneNumbers( - COUNTRY_CODE, - PhoneNumberType.TOLL_FREE, - PhoneNumberAssignmentType.APPLICATION, - capabilities)); - } - - private SyncPoller beginPurchasePhoneNumbersHelper( - HttpClient httpClient, String searchId, String testName, boolean withContext) { - if (withContext) { - return setPollInterval(this.getClientWithConnectionString(httpClient, testName) - .beginPurchasePhoneNumbers(searchId, Context.NONE)); + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getLocalitiesWithAdministrativeDivision(HttpClient httpClient) { + String localityAdministraiveDivision = this + .getClientWithConnectionString(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", null).iterator().next().getAdministrativeDivision() + .getAbbreviatedName(); + PagedIterable localitiesResult = this + .getClientWithConnectionString(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", localityAdministraiveDivision); + PhoneNumberLocality locality = localitiesResult.iterator().next(); + assertNotNull(locality); + assertEquals(locality.getAdministrativeDivision().getAbbreviatedName(), localityAdministraiveDivision); } - return setPollInterval(this.getClientWithConnectionString(httpClient, testName) - .beginPurchasePhoneNumbers(searchId)); - } - - private SyncPoller beginReleasePhoneNumberHelper( - HttpClient httpClient, String phoneNumber, String testName, boolean withContext) { - if (getTestMode() == TestMode.PLAYBACK) { - phoneNumber = "+REDACTED"; + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getOfferings(HttpClient httpClient) { + PagedIterable offeringsResult = this + .getClientWithConnectionString(httpClient, "listAvailableOfferings") + .listAvailableOfferings("US", null, null); + PhoneNumberOffering offering = offeringsResult.iterator().next(); + assertNotNull(offering); } - if (withContext) { - return setPollInterval(this.getClientWithConnectionString(httpClient, testName) - .beginReleasePhoneNumber(phoneNumber, Context.NONE)); + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getTollFreeAreaCodesWithAAD(HttpClient httpClient) { + PagedIterable areaCodesResult = this + .getClientWithManagedIdentity(httpClient, "listAvailableTollFreeAreaCodes") + .listAvailableTollFreeAreaCodes("US"); + String[] expectedAreaCodes = { "888", "877", "866", "855", "844", "800", "833", "88" }; + for (PhoneNumberAreaCode areaCode : areaCodesResult) { + assertTrue(Arrays.asList(expectedAreaCodes).contains(areaCode)); + } } - return setPollInterval(this.getClientWithConnectionString(httpClient, testName) - .beginReleasePhoneNumber(phoneNumber)); - } - - private SyncPoller beginUpdatePhoneNumberCapabilitiesHelper( - HttpClient httpClient, String phoneNumber, String testName, boolean withContext) { - PhoneNumbersClient client = this.getClientWithConnectionString(httpClient, testName); - Response responseAcquiredPhone = client.getPurchasedPhoneNumberWithResponse(phoneNumber, - Context.NONE); - PhoneNumberCapabilities capabilities = new PhoneNumberCapabilities(); - capabilities.setCalling( - responseAcquiredPhone.getValue().getCapabilities().getCalling() == PhoneNumberCapabilityType.INBOUND - ? PhoneNumberCapabilityType.OUTBOUND - : PhoneNumberCapabilityType.INBOUND); - capabilities.setSms(responseAcquiredPhone.getValue().getCapabilities() - .getSms() == PhoneNumberCapabilityType.INBOUND_OUTBOUND ? PhoneNumberCapabilityType.OUTBOUND - : PhoneNumberCapabilityType.INBOUND_OUTBOUND); - if (withContext) { - return setPollInterval(client.beginUpdatePhoneNumberCapabilities(phoneNumber, capabilities, Context.NONE)); + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getGeographicAreaCodesWithAAD(HttpClient httpClient) { + PhoneNumberLocality locality = this.getClientWithConnectionString(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", null).iterator().next(); + PagedIterable areaCodesResult = this + .getClientWithManagedIdentity(httpClient, "listAvailableGeographicAreaCodes") + .listAvailableGeographicAreaCodes("US", PhoneNumberAssignmentType.PERSON, + locality.getLocalizedName(), + locality.getAdministrativeDivision().getAbbreviatedName()); + PhoneNumberAreaCode areaCodes = areaCodesResult.iterator().next(); + assertNotNull(areaCodes); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getCountriesWithAAD(HttpClient httpClient) { + PagedIterable countriesResult = this + .getClientWithManagedIdentity(httpClient, "listAvailableCountries") + .listAvailableCountries(); + PhoneNumberCountry country = countriesResult.iterator().next(); + assertNotNull(country); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getLocalitiesWithAAD(HttpClient httpClient) { + PagedIterable localitiesResult = this + .getClientWithManagedIdentity(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", null); + PhoneNumberLocality locality = localitiesResult.iterator().next(); + assertNotNull(locality); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getLocalitiesWithAdministrativeDivisionWithAAD(HttpClient httpClient) { + PagedIterable localities = this + .getClientWithManagedIdentity(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", null); + PhoneNumberLocality localityWithAD = localities.iterator().next(); + + PagedIterable localitiesResult = this + .getClientWithManagedIdentity(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", + localityWithAD.getAdministrativeDivision().getAbbreviatedName()); + PhoneNumberLocality locality = localitiesResult.iterator().next(); + assertNotNull(locality); + assertEquals(locality.getAdministrativeDivision().getAbbreviatedName(), + localityWithAD.getAdministrativeDivision().getAbbreviatedName()); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getOfferingsWithAAD(HttpClient httpClient) { + PagedIterable offeringsResult = this + .getClientWithManagedIdentity(httpClient, "listAvailableOfferings") + .listAvailableOfferings("US", null, null); + PhoneNumberOffering offering = offeringsResult.iterator().next(); + assertNotNull(offering); + } + + private SyncPoller beginSearchAvailablePhoneNumbersHelper( + HttpClient httpClient, String testName, boolean withContext) { + PhoneNumberCapabilities capabilities = new PhoneNumberCapabilities(); + capabilities.setCalling(PhoneNumberCapabilityType.INBOUND); + capabilities.setSms(PhoneNumberCapabilityType.INBOUND_OUTBOUND); + PhoneNumberSearchOptions searchOptions = new PhoneNumberSearchOptions().setQuantity(1); + + if (withContext) { + return setPollInterval(getClientWithConnectionString(httpClient, testName) + .beginSearchAvailablePhoneNumbers( + COUNTRY_CODE, + PhoneNumberType.TOLL_FREE, + PhoneNumberAssignmentType.APPLICATION, + capabilities, + searchOptions, + Context.NONE)); + } + return setPollInterval( + getClientWithConnectionString(httpClient, testName).beginSearchAvailablePhoneNumbers( + COUNTRY_CODE, + PhoneNumberType.TOLL_FREE, + PhoneNumberAssignmentType.APPLICATION, + capabilities)); + } + + private SyncPoller beginPurchasePhoneNumbersHelper( + HttpClient httpClient, String searchId, String testName, boolean withContext) { + if (withContext) { + return setPollInterval(this.getClientWithConnectionString(httpClient, testName) + .beginPurchasePhoneNumbers(searchId, Context.NONE)); + } + return setPollInterval(this.getClientWithConnectionString(httpClient, testName) + .beginPurchasePhoneNumbers(searchId)); + } + + private SyncPoller beginReleasePhoneNumberHelper( + HttpClient httpClient, String phoneNumber, String testName, boolean withContext) { + if (getTestMode() == TestMode.PLAYBACK) { + phoneNumber = "+REDACTED"; + } + if (withContext) { + return setPollInterval(this.getClientWithConnectionString(httpClient, testName) + .beginReleasePhoneNumber(phoneNumber, Context.NONE)); + } + return setPollInterval(this.getClientWithConnectionString(httpClient, testName) + .beginReleasePhoneNumber(phoneNumber)); + } + + private SyncPoller beginUpdatePhoneNumberCapabilitiesHelper( + HttpClient httpClient, String phoneNumber, String testName, boolean withContext) { + PhoneNumbersClient client = this.getClientWithConnectionString(httpClient, testName); + Response responseAcquiredPhone = client.getPurchasedPhoneNumberWithResponse( + phoneNumber, + Context.NONE); + PhoneNumberCapabilities capabilities = new PhoneNumberCapabilities(); + capabilities.setCalling( + responseAcquiredPhone.getValue().getCapabilities() + .getCalling() == PhoneNumberCapabilityType.INBOUND + ? PhoneNumberCapabilityType.OUTBOUND + : PhoneNumberCapabilityType.INBOUND); + capabilities.setSms(responseAcquiredPhone.getValue().getCapabilities() + .getSms() == PhoneNumberCapabilityType.INBOUND_OUTBOUND + ? PhoneNumberCapabilityType.OUTBOUND + : PhoneNumberCapabilityType.INBOUND_OUTBOUND); + if (withContext) { + return setPollInterval(client.beginUpdatePhoneNumberCapabilities(phoneNumber, capabilities, + Context.NONE)); + } + return setPollInterval(client.beginUpdatePhoneNumberCapabilities(phoneNumber, capabilities)); + } + + private SyncPoller setPollInterval(SyncPoller syncPoller) { + return interceptorManager.isPlaybackMode() + ? syncPoller.setPollInterval(Duration.ofMillis(1)) + : syncPoller.setPollInterval(Duration.ofSeconds(1)); + } + + private PhoneNumbersClient getClientWithConnectionString(HttpClient httpClient, String testName) { + PhoneNumbersClientBuilder builder = super.getClientBuilderWithConnectionString(httpClient); + return addLoggingPolicy(builder, testName).buildClient(); + } + + private PhoneNumbersClient getClientWithManagedIdentity(HttpClient httpClient, String testName) { + PhoneNumbersClientBuilder builder = super.getClientBuilderUsingManagedIdentity(httpClient); + return addLoggingPolicy(builder, testName).buildClient(); } - return setPollInterval(client.beginUpdatePhoneNumberCapabilities(phoneNumber, capabilities)); - } - - private SyncPoller setPollInterval(SyncPoller syncPoller) { - return interceptorManager.isPlaybackMode() - ? syncPoller.setPollInterval(Duration.ofMillis(1)) - : syncPoller.setPollInterval(Duration.ofSeconds(1)); - } - - private PhoneNumbersClient getClientWithConnectionString(HttpClient httpClient, String testName) { - PhoneNumbersClientBuilder builder = super.getClientBuilderWithConnectionString(httpClient); - return addLoggingPolicy(builder, testName).buildClient(); - } - - private PhoneNumbersClient getClientWithManagedIdentity(HttpClient httpClient, String testName) { - PhoneNumbersClientBuilder builder = super.getClientBuilderUsingManagedIdentity(httpClient); - return addLoggingPolicy(builder, testName).buildClient(); - } } From 6d3a7e2dcc1b0ae2a2761b5899481060ab77df44 Mon Sep 17 00:00:00 2001 From: Sofia Robles Sandoval Date: Fri, 13 Oct 2023 13:44:27 -0600 Subject: [PATCH 03/11] Fix identation --- ...honeNumbersAsyncClientIntegrationTest.java | 87 +- .../PhoneNumbersClientIntegrationTest.java | 753 +++++++++--------- 2 files changed, 437 insertions(+), 403 deletions(-) diff --git a/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersAsyncClientIntegrationTest.java b/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersAsyncClientIntegrationTest.java index 7eb24fff838e..f6153b4f9e61 100644 --- a/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersAsyncClientIntegrationTest.java +++ b/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersAsyncClientIntegrationTest.java @@ -82,7 +82,8 @@ public void getPurchasedPhoneNumberWithResponse(HttpClient httpClient) { @MethodSource("com.azure.core.test.TestBase#getHttpClients") public void listPurchasedPhoneNumbers(HttpClient httpClient) { StepVerifier.create( - this.getClientWithConnectionString(httpClient, "listPurchasedPhoneNumbers").listPurchasedPhoneNumbers() + this.getClientWithConnectionString(httpClient, "listPurchasedPhoneNumbers") + .listPurchasedPhoneNumbers() .next()) .assertNext((PurchasedPhoneNumber number) -> { assertNotNull(number.getPhoneNumber()); @@ -138,19 +139,27 @@ public void beginPurchaseandReleasePhoneNumbers(HttpClient httpClient) { .flatMap((AsyncPollResponse result) -> { return result.getFinalResult() .flatMap((PhoneNumberSearchResult searchResult) -> { - String phoneNumber = searchResult.getPhoneNumbers().get(0); - return beginPurchasePhoneNumbersHelper(client, searchResult.getSearchId()) + String phoneNumber = searchResult + .getPhoneNumbers() + .get(0); + return beginPurchasePhoneNumbersHelper( + client, + searchResult.getSearchId()) .last() .flatMap(( AsyncPollResponse purchaseResult) -> { assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, purchaseResult.getStatus()); - return beginReleasePhoneNumberHelper(client, phoneNumber).last(); + return beginReleasePhoneNumberHelper( + client, + phoneNumber) + .last(); }); }); })) .assertNext((AsyncPollResponse releaseResult) -> { - assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, releaseResult.getStatus()); + assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, + releaseResult.getStatus()); }) .verifyComplete(); @@ -168,21 +177,25 @@ public void beginUpdatePhoneNumberCapabilities(HttpClient httpClient) { client.getPurchasedPhoneNumberWithResponse(phoneNumber) .flatMap(responseAcquiredPhone -> { PhoneNumberCapabilities capabilities = new PhoneNumberCapabilities(); - capabilities.setCalling(responseAcquiredPhone.getValue().getCapabilities() + capabilities.setCalling(responseAcquiredPhone.getValue() + .getCapabilities() .getCalling() == PhoneNumberCapabilityType.INBOUND ? PhoneNumberCapabilityType.OUTBOUND : PhoneNumberCapabilityType.INBOUND); - capabilities.setSms(responseAcquiredPhone.getValue().getCapabilities() + capabilities.setSms(responseAcquiredPhone.getValue() + .getCapabilities() .getSms() == PhoneNumberCapabilityType.INBOUND_OUTBOUND ? PhoneNumberCapabilityType.OUTBOUND : PhoneNumberCapabilityType.INBOUND_OUTBOUND); - return beginUpdatePhoneNumberCapabilitiesHelper(client, phoneNumber, capabilities) + return beginUpdatePhoneNumberCapabilitiesHelper(client, + phoneNumber, capabilities) .last() .flatMap((AsyncPollResponse result) -> { assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, result.getStatus()); assertEquals(PhoneNumberOperationStatus.SUCCEEDED, - result.getValue().getStatus()); + result.getValue() + .getStatus()); return result.getFinalResult(); }); })) @@ -203,7 +216,8 @@ public void getPurchasedPhoneNumberNullNumber(HttpClient httpClient) { @MethodSource("com.azure.core.test.TestBase#getHttpClients") public void getPurchasedPhoneNumberWithResponseNullNumber(HttpClient httpClient) { StepVerifier.create( - this.getClientWithConnectionString(httpClient, "getPurchasedPhoneNumberWithResponseNullNumber") + this.getClientWithConnectionString(httpClient, + "getPurchasedPhoneNumberWithResponseNullNumber") .getPurchasedPhoneNumberWithResponse(null)) .verifyError(); } @@ -212,7 +226,8 @@ public void getPurchasedPhoneNumberWithResponseNullNumber(HttpClient httpClient) @MethodSource("com.azure.core.test.TestBase#getHttpClients") public void beginSearchAvailablePhoneNumbersNullCountryCode(HttpClient httpClient) { StepVerifier.create( - this.getClientWithConnectionString(httpClient, "beginSearchAvailablePhoneNumbersNullCountryCode") + this.getClientWithConnectionString(httpClient, + "beginSearchAvailablePhoneNumbersNullCountryCode") .beginSearchAvailablePhoneNumbers(null, PhoneNumberType.TOLL_FREE, PhoneNumberAssignmentType.APPLICATION, null, null)) .verifyError(); @@ -222,8 +237,10 @@ public void beginSearchAvailablePhoneNumbersNullCountryCode(HttpClient httpClien @MethodSource("com.azure.core.test.TestBase#getHttpClients") public void beginUpdatePhoneNumberCapabilitiesNullPhoneNumber(HttpClient httpClient) { StepVerifier.create( - this.getClientWithConnectionString(httpClient, "beginUpdatePhoneNumberCapabilitiesNullPhoneNumber") - .beginUpdatePhoneNumberCapabilities(null, new PhoneNumberCapabilities())) + this.getClientWithConnectionString(httpClient, + "beginUpdatePhoneNumberCapabilitiesNullPhoneNumber") + .beginUpdatePhoneNumberCapabilities(null, + new PhoneNumberCapabilities())) .verifyError(); } @@ -245,8 +262,10 @@ public void beginUpdatePhoneNumberCapabilitiesInvalidPhoneNumber(HttpClient http PhoneNumberCapabilities capabilities = new PhoneNumberCapabilities(); capabilities.setCalling(PhoneNumberCapabilityType.INBOUND); StepVerifier.create( - this.getClientWithConnectionString(httpClient, "beginUpdatePhoneNumberCapabilitiesInvalidPhoneNumber") - .beginUpdatePhoneNumberCapabilities("invalid-phone-number", capabilities)) + this.getClientWithConnectionString(httpClient, + "beginUpdatePhoneNumberCapabilitiesInvalidPhoneNumber") + .beginUpdatePhoneNumberCapabilities("invalid-phone-number", + capabilities)) .verifyError(); } @@ -255,7 +274,9 @@ public void beginUpdatePhoneNumberCapabilitiesInvalidPhoneNumber(HttpClient http public void getTollFreeAreaCodesWithAAD(HttpClient httpClient) { StepVerifier.create( this.getClientWithManagedIdentity(httpClient, "listAvailableTollFreeAreaCodes") - .listAvailableTollFreeAreaCodes("US", PhoneNumberAssignmentType.APPLICATION).next()) + .listAvailableTollFreeAreaCodes("US", + PhoneNumberAssignmentType.APPLICATION) + .next()) .verifyComplete(); } @@ -266,8 +287,11 @@ public void getGeographicAreaCodesWithAAD(HttpClient httpClient) { .listAvailableLocalities("US", null).blockFirst(); StepVerifier.create( this.getClientWithManagedIdentity(httpClient, "listAvailableGeographicAreaCodes") - .listAvailableGeographicAreaCodes("US", PhoneNumberAssignmentType.PERSON, - locality.getLocalizedName(), locality.getAdministrativeDivision().getAbbreviatedName()) + .listAvailableGeographicAreaCodes("US", + PhoneNumberAssignmentType.PERSON, + locality.getLocalizedName(), + locality.getAdministrativeDivision() + .getAbbreviatedName()) .next()) .assertNext((PhoneNumberAreaCode areaCodes) -> { assertNotNull(areaCodes); @@ -279,7 +303,8 @@ public void getGeographicAreaCodesWithAAD(HttpClient httpClient) { @MethodSource("com.azure.core.test.TestBase#getHttpClients") public void getCountriesWithAAD(HttpClient httpClient) { StepVerifier.create( - this.getClientWithManagedIdentity(httpClient, "listAvailableCountries").listAvailableCountries().next()) + this.getClientWithManagedIdentity(httpClient, "listAvailableCountries") + .listAvailableCountries().next()) .assertNext((PhoneNumberCountry country) -> { assertNotNull(country); }) @@ -305,7 +330,9 @@ public void getLocalitiesAdministrativeDivisionWithAAD(HttpClient httpClient) { .listAvailableLocalities("US", null).blockFirst(); StepVerifier.create( this.getClientWithManagedIdentity(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", locality.getAdministrativeDivision().getAbbreviatedName()) + .listAvailableLocalities("US", + locality.getAdministrativeDivision() + .getAbbreviatedName()) .next()) .assertNext((PhoneNumberLocality localityWithAD) -> { assertNotNull(localityWithAD); @@ -332,7 +359,9 @@ public void getOfferingsWithAAD(HttpClient httpClient) { public void getTollFreeAreaCodes(HttpClient httpClient) { StepVerifier.create( this.getClientWithConnectionString(httpClient, "listAvailableTollFreeAreaCodes") - .listAvailableTollFreeAreaCodes("US", PhoneNumberAssignmentType.APPLICATION).next()) + .listAvailableTollFreeAreaCodes("US", + PhoneNumberAssignmentType.APPLICATION) + .next()) .verifyComplete(); } @@ -343,8 +372,11 @@ public void getGeographicAreaCodes(HttpClient httpClient) { .listAvailableLocalities("US", null).blockFirst(); StepVerifier.create( this.getClientWithConnectionString(httpClient, "listAvailableGeographicAreaCodes") - .listAvailableGeographicAreaCodes("US", PhoneNumberAssignmentType.PERSON, - locality.getLocalizedName(), locality.getAdministrativeDivision().getAbbreviatedName()) + .listAvailableGeographicAreaCodes("US", + PhoneNumberAssignmentType.PERSON, + locality.getLocalizedName(), + locality.getAdministrativeDivision() + .getAbbreviatedName()) .next()) .assertNext((PhoneNumberAreaCode areaCodes) -> { assertNotNull(areaCodes); @@ -356,7 +388,8 @@ public void getGeographicAreaCodes(HttpClient httpClient) { @MethodSource("com.azure.core.test.TestBase#getHttpClients") public void getCountries(HttpClient httpClient) { StepVerifier.create( - this.getClientWithConnectionString(httpClient, "listAvailableCountries").listAvailableCountries() + this.getClientWithConnectionString(httpClient, "listAvailableCountries") + .listAvailableCountries() .next()) .assertNext((PhoneNumberCountry country) -> { assertNotNull(country); @@ -379,8 +412,10 @@ public void getLocalities(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") public void getLocalitiesAdministrativeDivision(HttpClient httpClient) { - String localityAdministraiveDivision = this.getClientWithConnectionString(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", null).blockFirst().getAdministrativeDivision().getAbbreviatedName(); + String localityAdministraiveDivision = this + .getClientWithConnectionString(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", null).blockFirst().getAdministrativeDivision() + .getAbbreviatedName(); StepVerifier.create( this.getClientWithConnectionString(httpClient, "listAvailableLocalities") .listAvailableLocalities("US", localityAdministraiveDivision).next()) diff --git a/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersClientIntegrationTest.java b/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersClientIntegrationTest.java index 5c6cfaa23ea2..c3c0863ce838 100644 --- a/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersClientIntegrationTest.java +++ b/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersClientIntegrationTest.java @@ -31,7 +31,6 @@ import java.time.Duration; import java.util.Arrays; -import java.util.stream.Stream; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -40,390 +39,390 @@ public class PhoneNumbersClientIntegrationTest extends PhoneNumbersIntegrationTestBase { - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getPurchasedPhoneNumber(HttpClient httpClient) { - String phoneNumber = redactIfPlaybackMode(getTestPhoneNumber()); - PurchasedPhoneNumber number = this - .getClientWithConnectionString(httpClient, "getPurchasedPhoneNumberSync") - .getPurchasedPhoneNumber(phoneNumber); - assertEquals(phoneNumber, number.getPhoneNumber()); - assertEquals(COUNTRY_CODE, number.getCountryCode()); + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getPurchasedPhoneNumber(HttpClient httpClient) { + String phoneNumber = redactIfPlaybackMode(getTestPhoneNumber()); + PurchasedPhoneNumber number = this + .getClientWithConnectionString(httpClient, "getPurchasedPhoneNumberSync") + .getPurchasedPhoneNumber(phoneNumber); + assertEquals(phoneNumber, number.getPhoneNumber()); + assertEquals(COUNTRY_CODE, number.getCountryCode()); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getPurchasedPhoneNumberWithAAD(HttpClient httpClient) { + String phoneNumber = redactIfPlaybackMode(getTestPhoneNumber()); + PurchasedPhoneNumber number = this + .getClientWithManagedIdentity(httpClient, "getPurchasedPhoneNumberWithAADSync") + .getPurchasedPhoneNumber(phoneNumber); + assertEquals(phoneNumber, number.getPhoneNumber()); + assertEquals(COUNTRY_CODE, number.getCountryCode()); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getPurchasedPhoneNumberWithResponse(HttpClient httpClient) { + String phoneNumber = redactIfPlaybackMode(getTestPhoneNumber()); + Response response = this + .getClientWithConnectionString(httpClient, "getPurchasedPhoneNumberWithResponseSync") + .getPurchasedPhoneNumberWithResponse(phoneNumber, Context.NONE); + PurchasedPhoneNumber number = response.getValue(); + assertEquals(200, response.getStatusCode()); + assertEquals(phoneNumber, number.getPhoneNumber()); + assertEquals(COUNTRY_CODE, number.getCountryCode()); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void listPurchasedPhoneNumbers(HttpClient httpClient) { + PagedIterable numbers = this + .getClientWithConnectionString(httpClient, "listPurchasedPhoneNumbersSync") + .listPurchasedPhoneNumbers(Context.NONE); + PurchasedPhoneNumber number = numbers.iterator().next(); + assertNotNull(number.getPhoneNumber()); + assertEquals(COUNTRY_CODE, number.getCountryCode()); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void listPurchasedPhoneNumbersWithoutContext(HttpClient httpClient) { + PagedIterable numbers = this + .getClientWithConnectionString(httpClient, "listPurchasedPhoneNumbersSync") + .listPurchasedPhoneNumbers(); + PurchasedPhoneNumber number = numbers.iterator().next(); + assertNotNull(number.getPhoneNumber()); + assertEquals(COUNTRY_CODE, number.getCountryCode()); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable(named = "COMMUNICATION_SKIP_INT_PHONENUMBERS_TEST", matches = "(?i)(true)") + public void beginSearchAvailablePhoneNumbers(HttpClient httpClient) { + SyncPoller poller = beginSearchAvailablePhoneNumbersHelper( + httpClient, "beginSearchAvailablePhoneNumbersSync", true); + PollResponse response = poller.waitForCompletion(); + if (LongRunningOperationStatus.SUCCESSFULLY_COMPLETED == response.getStatus()) { + PhoneNumberSearchResult searchResult = poller.getFinalResult(); + assertEquals(searchResult.getPhoneNumbers().size(), 1); + assertNotNull(searchResult.getSearchId()); + } else { + fail("Long Running Operation Status was not successfully completed"); } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getPurchasedPhoneNumberWithAAD(HttpClient httpClient) { - String phoneNumber = redactIfPlaybackMode(getTestPhoneNumber()); - PurchasedPhoneNumber number = this - .getClientWithManagedIdentity(httpClient, "getPurchasedPhoneNumberWithAADSync") - .getPurchasedPhoneNumber(phoneNumber); - assertEquals(phoneNumber, number.getPhoneNumber()); - assertEquals(COUNTRY_CODE, number.getCountryCode()); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getPurchasedPhoneNumberWithResponse(HttpClient httpClient) { - String phoneNumber = redactIfPlaybackMode(getTestPhoneNumber()); - Response response = this - .getClientWithConnectionString(httpClient, "getPurchasedPhoneNumberWithResponseSync") - .getPurchasedPhoneNumberWithResponse(phoneNumber, Context.NONE); - PurchasedPhoneNumber number = response.getValue(); - assertEquals(200, response.getStatusCode()); - assertEquals(phoneNumber, number.getPhoneNumber()); - assertEquals(COUNTRY_CODE, number.getCountryCode()); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void listPurchasedPhoneNumbers(HttpClient httpClient) { - PagedIterable numbers = this - .getClientWithConnectionString(httpClient, "listPurchasedPhoneNumbersSync") - .listPurchasedPhoneNumbers(Context.NONE); - PurchasedPhoneNumber number = numbers.iterator().next(); - assertNotNull(number.getPhoneNumber()); - assertEquals(COUNTRY_CODE, number.getCountryCode()); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void listPurchasedPhoneNumbersWithoutContext(HttpClient httpClient) { - PagedIterable numbers = this - .getClientWithConnectionString(httpClient, "listPurchasedPhoneNumbersSync") - .listPurchasedPhoneNumbers(); - PurchasedPhoneNumber number = numbers.iterator().next(); - assertNotNull(number.getPhoneNumber()); - assertEquals(COUNTRY_CODE, number.getCountryCode()); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable(named = "COMMUNICATION_SKIP_INT_PHONENUMBERS_TEST", matches = "(?i)(true)") - public void beginSearchAvailablePhoneNumbers(HttpClient httpClient) { - SyncPoller poller = beginSearchAvailablePhoneNumbersHelper( - httpClient, "beginSearchAvailablePhoneNumbersSync", true); - PollResponse response = poller.waitForCompletion(); - if (LongRunningOperationStatus.SUCCESSFULLY_COMPLETED == response.getStatus()) { - PhoneNumberSearchResult searchResult = poller.getFinalResult(); - assertEquals(searchResult.getPhoneNumbers().size(), 1); - assertNotNull(searchResult.getSearchId()); - } else { - fail("Long Running Operation Status was not successfully completed"); - } - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable(named = "SKIP_LIVE_TEST", matches = "(?i)(true)") - public void beginPurchaseandReleasePhoneNumbersWithoutContext(HttpClient httpClient) { - SyncPoller poller = beginSearchAvailablePhoneNumbersHelper( - httpClient, - "beginPurchaseandReleasePhoneNumbers_beginSearchAvailablePhoneNumbersWithoutContextSync", - false); - PollResponse response = poller.waitForCompletion(); - if (LongRunningOperationStatus.SUCCESSFULLY_COMPLETED == response.getStatus()) { - PhoneNumberSearchResult searchResult = poller.getFinalResult(); - String phoneNumber = searchResult.getPhoneNumbers().get(0); - PollResponse purchaseOperationResponse = beginPurchasePhoneNumbersHelper( - httpClient, - searchResult.getSearchId(), "beginPurchasePhoneNumbersWithoutContextSync", - false) - .waitForCompletion(); - assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, - purchaseOperationResponse.getStatus()); - PollResponse releaseOperationResponse = beginReleasePhoneNumberHelper( - httpClient, - phoneNumber, "beginReleasePhoneNumberWithoutContextSync", false) - .waitForCompletion(); - assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, - releaseOperationResponse.getStatus()); - } else { - fail("Long Running Operation Status was not successfully completed"); - } - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable(named = "SKIP_LIVE_TEST", matches = "(?i)(true)") - public void beginPurchaseandReleasePhoneNumbers(HttpClient httpClient) { - SyncPoller poller = beginSearchAvailablePhoneNumbersHelper( - httpClient, "beginPurchaseandReleasePhoneNumbers_beginSearchAvailablePhoneNumbersSync", - true); - PollResponse response = poller.waitForCompletion(); - if (LongRunningOperationStatus.SUCCESSFULLY_COMPLETED == response.getStatus()) { - PhoneNumberSearchResult searchResult = poller.getFinalResult(); - String phoneNumber = searchResult.getPhoneNumbers().get(0); - PollResponse purchaseOperationResponse = beginPurchasePhoneNumbersHelper( - httpClient, - searchResult.getSearchId(), "beginPurchasePhoneNumbersSync", true) - .waitForCompletion(); - assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, - purchaseOperationResponse.getStatus()); - PollResponse releaseOperationResponse = beginReleasePhoneNumberHelper( - httpClient, - phoneNumber, "beginReleasePhoneNumberSync", true).waitForCompletion(); - assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, - releaseOperationResponse.getStatus()); - } else { - fail("Long Running Operation Status was not successfully completed"); - } - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable(named = "COMMUNICATION_SKIP_INT_PHONENUMBERS_TEST", matches = "(?i)(true)") - public void beginUpdatePhoneNumberCapabilitiesWithoutContext(HttpClient httpClient) { - String phoneNumber = getTestPhoneNumber(); - PollResponse result = beginUpdatePhoneNumberCapabilitiesHelper(httpClient, - phoneNumber, - "beginUpdatePhoneNumberCapabilitiesWithoutContextSync", false).waitForCompletion(); - assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, result.getStatus()); - assertEquals(PhoneNumberOperationStatus.SUCCEEDED, result.getValue().getStatus()); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable(named = "SKIP_LIVE_TEST", matches = "(?i)(true)") + public void beginPurchaseandReleasePhoneNumbersWithoutContext(HttpClient httpClient) { + SyncPoller poller = beginSearchAvailablePhoneNumbersHelper( + httpClient, + "beginPurchaseandReleasePhoneNumbers_beginSearchAvailablePhoneNumbersWithoutContextSync", + false); + PollResponse response = poller.waitForCompletion(); + if (LongRunningOperationStatus.SUCCESSFULLY_COMPLETED == response.getStatus()) { + PhoneNumberSearchResult searchResult = poller.getFinalResult(); + String phoneNumber = searchResult.getPhoneNumbers().get(0); + PollResponse purchaseOperationResponse = beginPurchasePhoneNumbersHelper( + httpClient, + searchResult.getSearchId(), "beginPurchasePhoneNumbersWithoutContextSync", + false) + .waitForCompletion(); + assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, + purchaseOperationResponse.getStatus()); + PollResponse releaseOperationResponse = beginReleasePhoneNumberHelper( + httpClient, + phoneNumber, "beginReleasePhoneNumberWithoutContextSync", false) + .waitForCompletion(); + assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, + releaseOperationResponse.getStatus()); + } else { + fail("Long Running Operation Status was not successfully completed"); } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable(named = "COMMUNICATION_SKIP_INT_PHONENUMBERS_TEST", matches = "(?i)(true)") - @DisabledIfEnvironmentVariable(named = "SKIP_UPDATE_CAPABILITIES_LIVE_TESTS", matches = "(?i)(true)") - public void beginUpdatePhoneNumberCapabilities(HttpClient httpClient) { - String phoneNumber = getTestPhoneNumber(); - PollResponse result = beginUpdatePhoneNumberCapabilitiesHelper(httpClient, - phoneNumber, - "beginUpdatePhoneNumberCapabilities", true).waitForCompletion(); - assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, result.getStatus()); - assertEquals(PhoneNumberOperationStatus.SUCCEEDED, result.getValue().getStatus()); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getTollFreeAreaCodes(HttpClient httpClient) { - PagedIterable areaCodesResult = this - .getClientWithConnectionString(httpClient, "listAvailableTollFreeAreaCodes") - .listAvailableTollFreeAreaCodes("US"); - String[] expectedAreaCodes = { "888", "877", "866", "855", "844", "800", "833", "88" }; - for (PhoneNumberAreaCode areaCode : areaCodesResult) { - assertTrue(Arrays.asList(expectedAreaCodes).contains(areaCode)); - } + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable(named = "SKIP_LIVE_TEST", matches = "(?i)(true)") + public void beginPurchaseandReleasePhoneNumbers(HttpClient httpClient) { + SyncPoller poller = beginSearchAvailablePhoneNumbersHelper( + httpClient, "beginPurchaseandReleasePhoneNumbers_beginSearchAvailablePhoneNumbersSync", + true); + PollResponse response = poller.waitForCompletion(); + if (LongRunningOperationStatus.SUCCESSFULLY_COMPLETED == response.getStatus()) { + PhoneNumberSearchResult searchResult = poller.getFinalResult(); + String phoneNumber = searchResult.getPhoneNumbers().get(0); + PollResponse purchaseOperationResponse = beginPurchasePhoneNumbersHelper( + httpClient, + searchResult.getSearchId(), "beginPurchasePhoneNumbersSync", true) + .waitForCompletion(); + assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, + purchaseOperationResponse.getStatus()); + PollResponse releaseOperationResponse = beginReleasePhoneNumberHelper( + httpClient, + phoneNumber, "beginReleasePhoneNumberSync", true).waitForCompletion(); + assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, + releaseOperationResponse.getStatus()); + } else { + fail("Long Running Operation Status was not successfully completed"); } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getGeographicAreaCodes(HttpClient httpClient) { - PhoneNumberLocality locality = this.getClientWithConnectionString(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", null).iterator().next(); - PagedIterable areaCodesResult = this - .getClientWithConnectionString(httpClient, "listAvailableGeographicAreaCodes") - .listAvailableGeographicAreaCodes("US", PhoneNumberAssignmentType.PERSON, - locality.getLocalizedName(), - locality.getAdministrativeDivision().getAbbreviatedName()); - PhoneNumberAreaCode areaCodes = areaCodesResult.iterator().next(); - assertNotNull(areaCodes); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable(named = "COMMUNICATION_SKIP_INT_PHONENUMBERS_TEST", matches = "(?i)(true)") + public void beginUpdatePhoneNumberCapabilitiesWithoutContext(HttpClient httpClient) { + String phoneNumber = getTestPhoneNumber(); + PollResponse result = beginUpdatePhoneNumberCapabilitiesHelper(httpClient, + phoneNumber, + "beginUpdatePhoneNumberCapabilitiesWithoutContextSync", false).waitForCompletion(); + assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, result.getStatus()); + assertEquals(PhoneNumberOperationStatus.SUCCEEDED, result.getValue().getStatus()); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable(named = "COMMUNICATION_SKIP_INT_PHONENUMBERS_TEST", matches = "(?i)(true)") + @DisabledIfEnvironmentVariable(named = "SKIP_UPDATE_CAPABILITIES_LIVE_TESTS", matches = "(?i)(true)") + public void beginUpdatePhoneNumberCapabilities(HttpClient httpClient) { + String phoneNumber = getTestPhoneNumber(); + PollResponse result = beginUpdatePhoneNumberCapabilitiesHelper(httpClient, + phoneNumber, + "beginUpdatePhoneNumberCapabilities", true).waitForCompletion(); + assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, result.getStatus()); + assertEquals(PhoneNumberOperationStatus.SUCCEEDED, result.getValue().getStatus()); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getTollFreeAreaCodes(HttpClient httpClient) { + PagedIterable areaCodesResult = this + .getClientWithConnectionString(httpClient, "listAvailableTollFreeAreaCodes") + .listAvailableTollFreeAreaCodes("US"); + String[] expectedAreaCodes = { "888", "877", "866", "855", "844", "800", "833", "88" }; + for (PhoneNumberAreaCode areaCode : areaCodesResult) { + assertTrue(Arrays.asList(expectedAreaCodes).contains(areaCode)); } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getCountries(HttpClient httpClient) { - PagedIterable countriesResult = this - .getClientWithConnectionString(httpClient, "listAvailableCountries") - .listAvailableCountries(); - PhoneNumberCountry country = countriesResult.iterator().next(); - assertNotNull(country); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getGeographicAreaCodes(HttpClient httpClient) { + PhoneNumberLocality locality = this.getClientWithConnectionString(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", null).iterator().next(); + PagedIterable areaCodesResult = this + .getClientWithConnectionString(httpClient, "listAvailableGeographicAreaCodes") + .listAvailableGeographicAreaCodes("US", PhoneNumberAssignmentType.PERSON, + locality.getLocalizedName(), + locality.getAdministrativeDivision().getAbbreviatedName()); + PhoneNumberAreaCode areaCodes = areaCodesResult.iterator().next(); + assertNotNull(areaCodes); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getCountries(HttpClient httpClient) { + PagedIterable countriesResult = this + .getClientWithConnectionString(httpClient, "listAvailableCountries") + .listAvailableCountries(); + PhoneNumberCountry country = countriesResult.iterator().next(); + assertNotNull(country); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getLocalities(HttpClient httpClient) { + PagedIterable localitiesResult = this + .getClientWithConnectionString(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", null); + PhoneNumberLocality locality = localitiesResult.iterator().next(); + assertNotNull(locality); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getLocalitiesWithAdministrativeDivision(HttpClient httpClient) { + String localityAdministraiveDivision = this + .getClientWithConnectionString(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", null).iterator().next().getAdministrativeDivision() + .getAbbreviatedName(); + PagedIterable localitiesResult = this + .getClientWithConnectionString(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", localityAdministraiveDivision); + PhoneNumberLocality locality = localitiesResult.iterator().next(); + assertNotNull(locality); + assertEquals(locality.getAdministrativeDivision().getAbbreviatedName(), localityAdministraiveDivision); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getOfferings(HttpClient httpClient) { + PagedIterable offeringsResult = this + .getClientWithConnectionString(httpClient, "listAvailableOfferings") + .listAvailableOfferings("US", null, null); + PhoneNumberOffering offering = offeringsResult.iterator().next(); + assertNotNull(offering); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getTollFreeAreaCodesWithAAD(HttpClient httpClient) { + PagedIterable areaCodesResult = this + .getClientWithManagedIdentity(httpClient, "listAvailableTollFreeAreaCodes") + .listAvailableTollFreeAreaCodes("US"); + String[] expectedAreaCodes = { "888", "877", "866", "855", "844", "800", "833", "88" }; + for (PhoneNumberAreaCode areaCode : areaCodesResult) { + assertTrue(Arrays.asList(expectedAreaCodes).contains(areaCode)); } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getLocalities(HttpClient httpClient) { - PagedIterable localitiesResult = this - .getClientWithConnectionString(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", null); - PhoneNumberLocality locality = localitiesResult.iterator().next(); - assertNotNull(locality); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getGeographicAreaCodesWithAAD(HttpClient httpClient) { + PhoneNumberLocality locality = this.getClientWithConnectionString(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", null).iterator().next(); + PagedIterable areaCodesResult = this + .getClientWithManagedIdentity(httpClient, "listAvailableGeographicAreaCodes") + .listAvailableGeographicAreaCodes("US", PhoneNumberAssignmentType.PERSON, + locality.getLocalizedName(), + locality.getAdministrativeDivision().getAbbreviatedName()); + PhoneNumberAreaCode areaCodes = areaCodesResult.iterator().next(); + assertNotNull(areaCodes); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getCountriesWithAAD(HttpClient httpClient) { + PagedIterable countriesResult = this + .getClientWithManagedIdentity(httpClient, "listAvailableCountries") + .listAvailableCountries(); + PhoneNumberCountry country = countriesResult.iterator().next(); + assertNotNull(country); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getLocalitiesWithAAD(HttpClient httpClient) { + PagedIterable localitiesResult = this + .getClientWithManagedIdentity(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", null); + PhoneNumberLocality locality = localitiesResult.iterator().next(); + assertNotNull(locality); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getLocalitiesWithAdministrativeDivisionWithAAD(HttpClient httpClient) { + PagedIterable localities = this + .getClientWithManagedIdentity(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", null); + PhoneNumberLocality localityWithAD = localities.iterator().next(); + + PagedIterable localitiesResult = this + .getClientWithManagedIdentity(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", + localityWithAD.getAdministrativeDivision().getAbbreviatedName()); + PhoneNumberLocality locality = localitiesResult.iterator().next(); + assertNotNull(locality); + assertEquals(locality.getAdministrativeDivision().getAbbreviatedName(), + localityWithAD.getAdministrativeDivision().getAbbreviatedName()); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getOfferingsWithAAD(HttpClient httpClient) { + PagedIterable offeringsResult = this + .getClientWithManagedIdentity(httpClient, "listAvailableOfferings") + .listAvailableOfferings("US", null, null); + PhoneNumberOffering offering = offeringsResult.iterator().next(); + assertNotNull(offering); + } + + private SyncPoller beginSearchAvailablePhoneNumbersHelper( + HttpClient httpClient, String testName, boolean withContext) { + PhoneNumberCapabilities capabilities = new PhoneNumberCapabilities(); + capabilities.setCalling(PhoneNumberCapabilityType.INBOUND); + capabilities.setSms(PhoneNumberCapabilityType.INBOUND_OUTBOUND); + PhoneNumberSearchOptions searchOptions = new PhoneNumberSearchOptions().setQuantity(1); + + if (withContext) { + return setPollInterval(getClientWithConnectionString(httpClient, testName) + .beginSearchAvailablePhoneNumbers( + COUNTRY_CODE, + PhoneNumberType.TOLL_FREE, + PhoneNumberAssignmentType.APPLICATION, + capabilities, + searchOptions, + Context.NONE)); } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getLocalitiesWithAdministrativeDivision(HttpClient httpClient) { - String localityAdministraiveDivision = this - .getClientWithConnectionString(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", null).iterator().next().getAdministrativeDivision() - .getAbbreviatedName(); - PagedIterable localitiesResult = this - .getClientWithConnectionString(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", localityAdministraiveDivision); - PhoneNumberLocality locality = localitiesResult.iterator().next(); - assertNotNull(locality); - assertEquals(locality.getAdministrativeDivision().getAbbreviatedName(), localityAdministraiveDivision); + return setPollInterval( + getClientWithConnectionString(httpClient, testName).beginSearchAvailablePhoneNumbers( + COUNTRY_CODE, + PhoneNumberType.TOLL_FREE, + PhoneNumberAssignmentType.APPLICATION, + capabilities)); + } + + private SyncPoller beginPurchasePhoneNumbersHelper( + HttpClient httpClient, String searchId, String testName, boolean withContext) { + if (withContext) { + return setPollInterval(this.getClientWithConnectionString(httpClient, testName) + .beginPurchasePhoneNumbers(searchId, Context.NONE)); } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getOfferings(HttpClient httpClient) { - PagedIterable offeringsResult = this - .getClientWithConnectionString(httpClient, "listAvailableOfferings") - .listAvailableOfferings("US", null, null); - PhoneNumberOffering offering = offeringsResult.iterator().next(); - assertNotNull(offering); + return setPollInterval(this.getClientWithConnectionString(httpClient, testName) + .beginPurchasePhoneNumbers(searchId)); + } + + private SyncPoller beginReleasePhoneNumberHelper( + HttpClient httpClient, String phoneNumber, String testName, boolean withContext) { + if (getTestMode() == TestMode.PLAYBACK) { + phoneNumber = "+REDACTED"; } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getTollFreeAreaCodesWithAAD(HttpClient httpClient) { - PagedIterable areaCodesResult = this - .getClientWithManagedIdentity(httpClient, "listAvailableTollFreeAreaCodes") - .listAvailableTollFreeAreaCodes("US"); - String[] expectedAreaCodes = { "888", "877", "866", "855", "844", "800", "833", "88" }; - for (PhoneNumberAreaCode areaCode : areaCodesResult) { - assertTrue(Arrays.asList(expectedAreaCodes).contains(areaCode)); - } + if (withContext) { + return setPollInterval(this.getClientWithConnectionString(httpClient, testName) + .beginReleasePhoneNumber(phoneNumber, Context.NONE)); } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getGeographicAreaCodesWithAAD(HttpClient httpClient) { - PhoneNumberLocality locality = this.getClientWithConnectionString(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", null).iterator().next(); - PagedIterable areaCodesResult = this - .getClientWithManagedIdentity(httpClient, "listAvailableGeographicAreaCodes") - .listAvailableGeographicAreaCodes("US", PhoneNumberAssignmentType.PERSON, - locality.getLocalizedName(), - locality.getAdministrativeDivision().getAbbreviatedName()); - PhoneNumberAreaCode areaCodes = areaCodesResult.iterator().next(); - assertNotNull(areaCodes); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getCountriesWithAAD(HttpClient httpClient) { - PagedIterable countriesResult = this - .getClientWithManagedIdentity(httpClient, "listAvailableCountries") - .listAvailableCountries(); - PhoneNumberCountry country = countriesResult.iterator().next(); - assertNotNull(country); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getLocalitiesWithAAD(HttpClient httpClient) { - PagedIterable localitiesResult = this - .getClientWithManagedIdentity(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", null); - PhoneNumberLocality locality = localitiesResult.iterator().next(); - assertNotNull(locality); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getLocalitiesWithAdministrativeDivisionWithAAD(HttpClient httpClient) { - PagedIterable localities = this - .getClientWithManagedIdentity(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", null); - PhoneNumberLocality localityWithAD = localities.iterator().next(); - - PagedIterable localitiesResult = this - .getClientWithManagedIdentity(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", - localityWithAD.getAdministrativeDivision().getAbbreviatedName()); - PhoneNumberLocality locality = localitiesResult.iterator().next(); - assertNotNull(locality); - assertEquals(locality.getAdministrativeDivision().getAbbreviatedName(), - localityWithAD.getAdministrativeDivision().getAbbreviatedName()); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getOfferingsWithAAD(HttpClient httpClient) { - PagedIterable offeringsResult = this - .getClientWithManagedIdentity(httpClient, "listAvailableOfferings") - .listAvailableOfferings("US", null, null); - PhoneNumberOffering offering = offeringsResult.iterator().next(); - assertNotNull(offering); - } - - private SyncPoller beginSearchAvailablePhoneNumbersHelper( - HttpClient httpClient, String testName, boolean withContext) { - PhoneNumberCapabilities capabilities = new PhoneNumberCapabilities(); - capabilities.setCalling(PhoneNumberCapabilityType.INBOUND); - capabilities.setSms(PhoneNumberCapabilityType.INBOUND_OUTBOUND); - PhoneNumberSearchOptions searchOptions = new PhoneNumberSearchOptions().setQuantity(1); - - if (withContext) { - return setPollInterval(getClientWithConnectionString(httpClient, testName) - .beginSearchAvailablePhoneNumbers( - COUNTRY_CODE, - PhoneNumberType.TOLL_FREE, - PhoneNumberAssignmentType.APPLICATION, - capabilities, - searchOptions, - Context.NONE)); - } - return setPollInterval( - getClientWithConnectionString(httpClient, testName).beginSearchAvailablePhoneNumbers( - COUNTRY_CODE, - PhoneNumberType.TOLL_FREE, - PhoneNumberAssignmentType.APPLICATION, - capabilities)); - } - - private SyncPoller beginPurchasePhoneNumbersHelper( - HttpClient httpClient, String searchId, String testName, boolean withContext) { - if (withContext) { - return setPollInterval(this.getClientWithConnectionString(httpClient, testName) - .beginPurchasePhoneNumbers(searchId, Context.NONE)); - } - return setPollInterval(this.getClientWithConnectionString(httpClient, testName) - .beginPurchasePhoneNumbers(searchId)); - } - - private SyncPoller beginReleasePhoneNumberHelper( - HttpClient httpClient, String phoneNumber, String testName, boolean withContext) { - if (getTestMode() == TestMode.PLAYBACK) { - phoneNumber = "+REDACTED"; - } - if (withContext) { - return setPollInterval(this.getClientWithConnectionString(httpClient, testName) - .beginReleasePhoneNumber(phoneNumber, Context.NONE)); - } - return setPollInterval(this.getClientWithConnectionString(httpClient, testName) - .beginReleasePhoneNumber(phoneNumber)); - } - - private SyncPoller beginUpdatePhoneNumberCapabilitiesHelper( - HttpClient httpClient, String phoneNumber, String testName, boolean withContext) { - PhoneNumbersClient client = this.getClientWithConnectionString(httpClient, testName); - Response responseAcquiredPhone = client.getPurchasedPhoneNumberWithResponse( - phoneNumber, - Context.NONE); - PhoneNumberCapabilities capabilities = new PhoneNumberCapabilities(); - capabilities.setCalling( - responseAcquiredPhone.getValue().getCapabilities() - .getCalling() == PhoneNumberCapabilityType.INBOUND - ? PhoneNumberCapabilityType.OUTBOUND - : PhoneNumberCapabilityType.INBOUND); - capabilities.setSms(responseAcquiredPhone.getValue().getCapabilities() - .getSms() == PhoneNumberCapabilityType.INBOUND_OUTBOUND - ? PhoneNumberCapabilityType.OUTBOUND - : PhoneNumberCapabilityType.INBOUND_OUTBOUND); - if (withContext) { - return setPollInterval(client.beginUpdatePhoneNumberCapabilities(phoneNumber, capabilities, - Context.NONE)); - } - return setPollInterval(client.beginUpdatePhoneNumberCapabilities(phoneNumber, capabilities)); - } - - private SyncPoller setPollInterval(SyncPoller syncPoller) { - return interceptorManager.isPlaybackMode() - ? syncPoller.setPollInterval(Duration.ofMillis(1)) - : syncPoller.setPollInterval(Duration.ofSeconds(1)); - } - - private PhoneNumbersClient getClientWithConnectionString(HttpClient httpClient, String testName) { - PhoneNumbersClientBuilder builder = super.getClientBuilderWithConnectionString(httpClient); - return addLoggingPolicy(builder, testName).buildClient(); - } - - private PhoneNumbersClient getClientWithManagedIdentity(HttpClient httpClient, String testName) { - PhoneNumbersClientBuilder builder = super.getClientBuilderUsingManagedIdentity(httpClient); - return addLoggingPolicy(builder, testName).buildClient(); + return setPollInterval(this.getClientWithConnectionString(httpClient, testName) + .beginReleasePhoneNumber(phoneNumber)); + } + + private SyncPoller beginUpdatePhoneNumberCapabilitiesHelper( + HttpClient httpClient, String phoneNumber, String testName, boolean withContext) { + PhoneNumbersClient client = this.getClientWithConnectionString(httpClient, testName); + Response responseAcquiredPhone = client.getPurchasedPhoneNumberWithResponse( + phoneNumber, + Context.NONE); + PhoneNumberCapabilities capabilities = new PhoneNumberCapabilities(); + capabilities.setCalling( + responseAcquiredPhone.getValue().getCapabilities() + .getCalling() == PhoneNumberCapabilityType.INBOUND + ? PhoneNumberCapabilityType.OUTBOUND + : PhoneNumberCapabilityType.INBOUND); + capabilities.setSms(responseAcquiredPhone.getValue().getCapabilities() + .getSms() == PhoneNumberCapabilityType.INBOUND_OUTBOUND + ? PhoneNumberCapabilityType.OUTBOUND + : PhoneNumberCapabilityType.INBOUND_OUTBOUND); + if (withContext) { + return setPollInterval(client.beginUpdatePhoneNumberCapabilities(phoneNumber, capabilities, + Context.NONE)); } + return setPollInterval(client.beginUpdatePhoneNumberCapabilities(phoneNumber, capabilities)); + } + + private SyncPoller setPollInterval(SyncPoller syncPoller) { + return interceptorManager.isPlaybackMode() + ? syncPoller.setPollInterval(Duration.ofMillis(1)) + : syncPoller.setPollInterval(Duration.ofSeconds(1)); + } + + private PhoneNumbersClient getClientWithConnectionString(HttpClient httpClient, String testName) { + PhoneNumbersClientBuilder builder = super.getClientBuilderWithConnectionString(httpClient); + return addLoggingPolicy(builder, testName).buildClient(); + } + + private PhoneNumbersClient getClientWithManagedIdentity(HttpClient httpClient, String testName) { + PhoneNumbersClientBuilder builder = super.getClientBuilderUsingManagedIdentity(httpClient); + return addLoggingPolicy(builder, testName).buildClient(); + } } From d9fbaebdd963888f93bdf22f746915e28f39ef57 Mon Sep 17 00:00:00 2001 From: Sofia Robles Sandoval Date: Fri, 13 Oct 2023 16:15:15 -0600 Subject: [PATCH 04/11] Fix phone number test --- .../PhoneNumbersAsyncClientIntegrationTest.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersAsyncClientIntegrationTest.java b/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersAsyncClientIntegrationTest.java index f6153b4f9e61..46a1eb979d74 100644 --- a/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersAsyncClientIntegrationTest.java +++ b/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersAsyncClientIntegrationTest.java @@ -276,8 +276,7 @@ public void getTollFreeAreaCodesWithAAD(HttpClient httpClient) { this.getClientWithManagedIdentity(httpClient, "listAvailableTollFreeAreaCodes") .listAvailableTollFreeAreaCodes("US", PhoneNumberAssignmentType.APPLICATION) - .next()) - .verifyComplete(); + .next()).expectAccessibleContext(); } @ParameterizedTest @@ -361,8 +360,7 @@ public void getTollFreeAreaCodes(HttpClient httpClient) { this.getClientWithConnectionString(httpClient, "listAvailableTollFreeAreaCodes") .listAvailableTollFreeAreaCodes("US", PhoneNumberAssignmentType.APPLICATION) - .next()) - .verifyComplete(); + .next()).expectAccessibleContext(); } @ParameterizedTest From 3059e873a20ebf6348fa8dce617fc08d6a7c6952 Mon Sep 17 00:00:00 2001 From: Sofia Robles Sandoval Date: Mon, 16 Oct 2023 11:01:05 -0600 Subject: [PATCH 05/11] Format issues --- ...honeNumbersAsyncClientIntegrationTest.java | 922 +++++++++--------- .../PhoneNumbersClientIntegrationTest.java | 772 +++++++-------- 2 files changed, 848 insertions(+), 846 deletions(-) diff --git a/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersAsyncClientIntegrationTest.java b/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersAsyncClientIntegrationTest.java index 46a1eb979d74..03fde97f163b 100644 --- a/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersAsyncClientIntegrationTest.java +++ b/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersAsyncClientIntegrationTest.java @@ -35,464 +35,466 @@ public class PhoneNumbersAsyncClientIntegrationTest extends PhoneNumbersIntegrationTestBase { - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getPurchasedPhoneNumber(HttpClient httpClient) { - String phoneNumber = redactIfPlaybackMode(getTestPhoneNumber()); - StepVerifier.create( - this.getClientWithConnectionString(httpClient, "getPurchasedPhoneNumber") - .getPurchasedPhoneNumber(phoneNumber)) - .assertNext((PurchasedPhoneNumber number) -> { - assertEquals(phoneNumber, number.getPhoneNumber()); - assertEquals(COUNTRY_CODE, number.getCountryCode()); - }) - .verifyComplete(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getPurchasedPhoneNumberWithAAD(HttpClient httpClient) { - String phoneNumber = redactIfPlaybackMode(getTestPhoneNumber()); - StepVerifier.create( - this.getClientWithManagedIdentity(httpClient, "getPurchasedPhoneNumberWithAAD") - .getPurchasedPhoneNumber(phoneNumber)) - .assertNext((PurchasedPhoneNumber number) -> { - assertEquals(phoneNumber, number.getPhoneNumber()); - assertEquals(COUNTRY_CODE, number.getCountryCode()); - }) - .verifyComplete(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getPurchasedPhoneNumberWithResponse(HttpClient httpClient) { - String phoneNumber = redactIfPlaybackMode(getTestPhoneNumber()); - StepVerifier.create( - this.getClientWithConnectionString(httpClient, "getPurchasedPhoneNumberWithResponse") - .getPurchasedPhoneNumberWithResponse(phoneNumber)) - .assertNext((Response response) -> { - assertEquals(200, response.getStatusCode()); - assertEquals(phoneNumber, response.getValue().getPhoneNumber()); - assertEquals(COUNTRY_CODE, response.getValue().getCountryCode()); - }) - .verifyComplete(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void listPurchasedPhoneNumbers(HttpClient httpClient) { - StepVerifier.create( - this.getClientWithConnectionString(httpClient, "listPurchasedPhoneNumbers") - .listPurchasedPhoneNumbers() - .next()) - .assertNext((PurchasedPhoneNumber number) -> { - assertNotNull(number.getPhoneNumber()); - assertEquals(COUNTRY_CODE, number.getCountryCode()); - }) - .verifyComplete(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable(named = "COMMUNICATION_SKIP_INT_PHONENUMBERS_TEST", matches = "(?i)(true)") - public void beginSearchAvailablePhoneNumbers(HttpClient httpClient) { - PhoneNumbersAsyncClient client = this.getClientWithConnectionString(httpClient, - "beginSearchAvailablePhoneNumbers"); - StepVerifier.create( - beginSearchAvailablePhoneNumbersHelper(client, true).last() - .flatMap((AsyncPollResponse result) -> { - return result.getFinalResult(); - })) - .assertNext((PhoneNumberSearchResult searchResult) -> { - assertEquals(searchResult.getPhoneNumbers().size(), 1); - assertNotNull(searchResult.getSearchId()); - }) - .verifyComplete(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable(named = "COMMUNICATION_SKIP_INT_PHONENUMBERS_TEST", matches = "(?i)(true)") - public void beginSearchAvailablePhoneNumbersWithoutOptions(HttpClient httpClient) { - PhoneNumbersAsyncClient client = this.getClientWithConnectionString(httpClient, - "getPurchasedPhoneNumberForCapabilities"); - StepVerifier.create( - beginSearchAvailablePhoneNumbersHelper(client, false).last() - .flatMap((AsyncPollResponse result) -> { - return result.getFinalResult(); - })) - .assertNext((PhoneNumberSearchResult searchResult) -> { - assertEquals(searchResult.getPhoneNumbers().size(), 1); - assertNotNull(searchResult.getSearchId()); - }) - .verifyComplete(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable(named = "SKIP_LIVE_TEST", matches = "(?i)(true)") - public void beginPurchaseandReleasePhoneNumbers(HttpClient httpClient) { - PhoneNumbersAsyncClient client = this.getClientWithConnectionString(httpClient, - "getPurchasedPhoneNumberForCapabilities"); - StepVerifier.create( - beginSearchAvailablePhoneNumbersHelper(client, true).last() - .flatMap((AsyncPollResponse result) -> { - return result.getFinalResult() - .flatMap((PhoneNumberSearchResult searchResult) -> { - String phoneNumber = searchResult - .getPhoneNumbers() - .get(0); - return beginPurchasePhoneNumbersHelper( - client, - searchResult.getSearchId()) - .last() - .flatMap(( - AsyncPollResponse purchaseResult) -> { - assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, - purchaseResult.getStatus()); - return beginReleasePhoneNumberHelper( - client, - phoneNumber) - .last(); - }); - }); - })) - .assertNext((AsyncPollResponse releaseResult) -> { - assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, - releaseResult.getStatus()); - - }) - .verifyComplete(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable(named = "COMMUNICATION_SKIP_INT_PHONENUMBERS_TEST", matches = "(?i)(true)") - @DisabledIfEnvironmentVariable(named = "SKIP_UPDATE_CAPABILITIES_LIVE_TESTS", matches = "(?i)(true)") - public void beginUpdatePhoneNumberCapabilities(HttpClient httpClient) { - String phoneNumber = getTestPhoneNumber(); - PhoneNumbersAsyncClient client = this.getClientWithConnectionString(httpClient, - "getPurchasedPhoneNumberForCapabilities"); - StepVerifier.create( - client.getPurchasedPhoneNumberWithResponse(phoneNumber) - .flatMap(responseAcquiredPhone -> { - PhoneNumberCapabilities capabilities = new PhoneNumberCapabilities(); - capabilities.setCalling(responseAcquiredPhone.getValue() - .getCapabilities() - .getCalling() == PhoneNumberCapabilityType.INBOUND - ? PhoneNumberCapabilityType.OUTBOUND - : PhoneNumberCapabilityType.INBOUND); - capabilities.setSms(responseAcquiredPhone.getValue() - .getCapabilities() - .getSms() == PhoneNumberCapabilityType.INBOUND_OUTBOUND - ? PhoneNumberCapabilityType.OUTBOUND - : PhoneNumberCapabilityType.INBOUND_OUTBOUND); - return beginUpdatePhoneNumberCapabilitiesHelper(client, - phoneNumber, capabilities) - .last() - .flatMap((AsyncPollResponse result) -> { - assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, - result.getStatus()); - assertEquals(PhoneNumberOperationStatus.SUCCEEDED, - result.getValue() - .getStatus()); - return result.getFinalResult(); - }); - })) - .assertNext(Assertions::assertNotNull) - .verifyComplete(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getPurchasedPhoneNumberNullNumber(HttpClient httpClient) { - StepVerifier.create( - this.getClientWithConnectionString(httpClient, "getPurchasedPhoneNumberNullNumber") - .getPurchasedPhoneNumber(null)) - .verifyError(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getPurchasedPhoneNumberWithResponseNullNumber(HttpClient httpClient) { - StepVerifier.create( - this.getClientWithConnectionString(httpClient, - "getPurchasedPhoneNumberWithResponseNullNumber") - .getPurchasedPhoneNumberWithResponse(null)) - .verifyError(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void beginSearchAvailablePhoneNumbersNullCountryCode(HttpClient httpClient) { - StepVerifier.create( - this.getClientWithConnectionString(httpClient, - "beginSearchAvailablePhoneNumbersNullCountryCode") - .beginSearchAvailablePhoneNumbers(null, PhoneNumberType.TOLL_FREE, - PhoneNumberAssignmentType.APPLICATION, null, null)) - .verifyError(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void beginUpdatePhoneNumberCapabilitiesNullPhoneNumber(HttpClient httpClient) { - StepVerifier.create( - this.getClientWithConnectionString(httpClient, - "beginUpdatePhoneNumberCapabilitiesNullPhoneNumber") - .beginUpdatePhoneNumberCapabilities(null, - new PhoneNumberCapabilities())) - .verifyError(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void beginUpdatePhoneNumberCapabilitiesUnauthorizedPhoneNumber(HttpClient httpClient) { - PhoneNumberCapabilities capabilities = new PhoneNumberCapabilities(); - capabilities.setCalling(PhoneNumberCapabilityType.INBOUND); - StepVerifier.create( - this.getClientWithConnectionString(httpClient, - "beginUpdatePhoneNumberCapabilitiesUnauthorizedPhoneNumber") - .beginUpdatePhoneNumberCapabilities("+14255555111", capabilities)) - .verifyError(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void beginUpdatePhoneNumberCapabilitiesInvalidPhoneNumber(HttpClient httpClient) { - PhoneNumberCapabilities capabilities = new PhoneNumberCapabilities(); - capabilities.setCalling(PhoneNumberCapabilityType.INBOUND); - StepVerifier.create( - this.getClientWithConnectionString(httpClient, - "beginUpdatePhoneNumberCapabilitiesInvalidPhoneNumber") - .beginUpdatePhoneNumberCapabilities("invalid-phone-number", - capabilities)) - .verifyError(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getTollFreeAreaCodesWithAAD(HttpClient httpClient) { - StepVerifier.create( - this.getClientWithManagedIdentity(httpClient, "listAvailableTollFreeAreaCodes") - .listAvailableTollFreeAreaCodes("US", - PhoneNumberAssignmentType.APPLICATION) - .next()).expectAccessibleContext(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getGeographicAreaCodesWithAAD(HttpClient httpClient) { - PhoneNumberLocality locality = this.getClientWithConnectionString(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", null).blockFirst(); - StepVerifier.create( - this.getClientWithManagedIdentity(httpClient, "listAvailableGeographicAreaCodes") - .listAvailableGeographicAreaCodes("US", - PhoneNumberAssignmentType.PERSON, - locality.getLocalizedName(), - locality.getAdministrativeDivision() - .getAbbreviatedName()) - .next()) - .assertNext((PhoneNumberAreaCode areaCodes) -> { - assertNotNull(areaCodes); - }) - .verifyComplete(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getCountriesWithAAD(HttpClient httpClient) { - StepVerifier.create( - this.getClientWithManagedIdentity(httpClient, "listAvailableCountries") - .listAvailableCountries().next()) - .assertNext((PhoneNumberCountry country) -> { - assertNotNull(country); - }) - .verifyComplete(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getLocalitiesWithAAD(HttpClient httpClient) { - StepVerifier.create( - this.getClientWithManagedIdentity(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", null).next()) - .assertNext((PhoneNumberLocality locality) -> { - assertNotNull(locality); - }) - .verifyComplete(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getLocalitiesAdministrativeDivisionWithAAD(HttpClient httpClient) { - PhoneNumberLocality locality = this.getClientWithConnectionString(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", null).blockFirst(); - StepVerifier.create( - this.getClientWithManagedIdentity(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", - locality.getAdministrativeDivision() - .getAbbreviatedName()) - .next()) - .assertNext((PhoneNumberLocality localityWithAD) -> { - assertNotNull(localityWithAD); - assertEquals(localityWithAD.getAdministrativeDivision().getAbbreviatedName(), - locality.getAdministrativeDivision().getAbbreviatedName()); - }) - .verifyComplete(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getOfferingsWithAAD(HttpClient httpClient) { - StepVerifier.create( - this.getClientWithManagedIdentity(httpClient, "listAvailableOfferings") - .listAvailableOfferings("US", null, null).next()) - .assertNext((PhoneNumberOffering offering) -> { - assertNotNull(offering); - }) - .verifyComplete(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getTollFreeAreaCodes(HttpClient httpClient) { - StepVerifier.create( - this.getClientWithConnectionString(httpClient, "listAvailableTollFreeAreaCodes") - .listAvailableTollFreeAreaCodes("US", - PhoneNumberAssignmentType.APPLICATION) - .next()).expectAccessibleContext(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getGeographicAreaCodes(HttpClient httpClient) { - PhoneNumberLocality locality = this.getClientWithConnectionString(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", null).blockFirst(); - StepVerifier.create( - this.getClientWithConnectionString(httpClient, "listAvailableGeographicAreaCodes") - .listAvailableGeographicAreaCodes("US", - PhoneNumberAssignmentType.PERSON, - locality.getLocalizedName(), - locality.getAdministrativeDivision() - .getAbbreviatedName()) - .next()) - .assertNext((PhoneNumberAreaCode areaCodes) -> { - assertNotNull(areaCodes); - }) - .verifyComplete(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getCountries(HttpClient httpClient) { - StepVerifier.create( - this.getClientWithConnectionString(httpClient, "listAvailableCountries") - .listAvailableCountries() - .next()) - .assertNext((PhoneNumberCountry country) -> { - assertNotNull(country); - }) - .verifyComplete(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getLocalities(HttpClient httpClient) { - StepVerifier.create( - this.getClientWithConnectionString(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", null).next()) - .assertNext((PhoneNumberLocality locality) -> { - assertNotNull(locality); - }) - .verifyComplete(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getLocalitiesAdministrativeDivision(HttpClient httpClient) { - String localityAdministraiveDivision = this - .getClientWithConnectionString(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", null).blockFirst().getAdministrativeDivision() - .getAbbreviatedName(); - StepVerifier.create( - this.getClientWithConnectionString(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", localityAdministraiveDivision).next()) - .assertNext((PhoneNumberLocality locality) -> { - assertNotNull(locality); - assertEquals(locality.getAdministrativeDivision().getAbbreviatedName(), - localityAdministraiveDivision); - }) - .verifyComplete(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getOfferings(HttpClient httpClient) { - StepVerifier.create( - this.getClientWithConnectionString(httpClient, "listAvailableOfferings") - .listAvailableOfferings("US", null, null).next()) - .assertNext((PhoneNumberOffering offering) -> { - assertNotNull(offering); - }) - .verifyComplete(); - } - - private PollerFlux beginSearchAvailablePhoneNumbersHelper( - PhoneNumbersAsyncClient client, boolean withOptions) { - PhoneNumberCapabilities capabilities = new PhoneNumberCapabilities(); - capabilities.setCalling(PhoneNumberCapabilityType.INBOUND); - capabilities.setSms(PhoneNumberCapabilityType.INBOUND_OUTBOUND); - PhoneNumberSearchOptions searchOptions = new PhoneNumberSearchOptions().setQuantity(1); - - if (withOptions) { - return setPollInterval(client - .beginSearchAvailablePhoneNumbers( - COUNTRY_CODE, - PhoneNumberType.TOLL_FREE, - PhoneNumberAssignmentType.APPLICATION, - capabilities, - searchOptions)); - } - return setPollInterval(client - .beginSearchAvailablePhoneNumbers( - COUNTRY_CODE, - PhoneNumberType.TOLL_FREE, - PhoneNumberAssignmentType.APPLICATION, - capabilities)); - } - - private PollerFlux beginPurchasePhoneNumbersHelper( - PhoneNumbersAsyncClient client, String searchId) { - return setPollInterval(client - .beginPurchasePhoneNumbers(searchId)); - } - - private PollerFlux beginReleasePhoneNumberHelper( - PhoneNumbersAsyncClient client, String phoneNumber) { - return setPollInterval(client - .beginReleasePhoneNumber(phoneNumber)); - } - - private PollerFlux beginUpdatePhoneNumberCapabilitiesHelper( - PhoneNumbersAsyncClient client, String phoneNumber, PhoneNumberCapabilities capabilities) { - - return setPollInterval(client - .beginUpdatePhoneNumberCapabilities(phoneNumber, capabilities)); - } - - private PollerFlux setPollInterval(PollerFlux pollerFlux) { - return interceptorManager.isPlaybackMode() - ? pollerFlux.setPollInterval(Duration.ofMillis(1)) - : pollerFlux.setPollInterval(Duration.ofSeconds(1)); - } - - private PhoneNumbersAsyncClient getClientWithConnectionString(HttpClient httpClient, String testName) { - PhoneNumbersClientBuilder builder = super.getClientBuilderWithConnectionString(httpClient); - return addLoggingPolicy(builder, testName).buildAsyncClient(); - } - - private PhoneNumbersAsyncClient getClientWithManagedIdentity(HttpClient httpClient, String testName) { - PhoneNumbersClientBuilder builder = super.getClientBuilderUsingManagedIdentity(httpClient); - return addLoggingPolicy(builder, testName).buildAsyncClient(); - } + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getPurchasedPhoneNumber(HttpClient httpClient) { + String phoneNumber = redactIfPlaybackMode(getTestPhoneNumber()); + StepVerifier.create( + this.getClientWithConnectionString(httpClient, "getPurchasedPhoneNumber") + .getPurchasedPhoneNumber(phoneNumber)) + .assertNext((PurchasedPhoneNumber number) -> { + assertEquals(phoneNumber, number.getPhoneNumber()); + assertEquals(COUNTRY_CODE, number.getCountryCode()); + }) + .verifyComplete(); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getPurchasedPhoneNumberWithAAD(HttpClient httpClient) { + String phoneNumber = redactIfPlaybackMode(getTestPhoneNumber()); + StepVerifier.create( + this.getClientWithManagedIdentity(httpClient, "getPurchasedPhoneNumberWithAAD") + .getPurchasedPhoneNumber(phoneNumber)) + .assertNext((PurchasedPhoneNumber number) -> { + assertEquals(phoneNumber, number.getPhoneNumber()); + assertEquals(COUNTRY_CODE, number.getCountryCode()); + }) + .verifyComplete(); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getPurchasedPhoneNumberWithResponse(HttpClient httpClient) { + String phoneNumber = redactIfPlaybackMode(getTestPhoneNumber()); + StepVerifier.create( + this.getClientWithConnectionString(httpClient, "getPurchasedPhoneNumberWithResponse") + .getPurchasedPhoneNumberWithResponse(phoneNumber)) + .assertNext((Response response) -> { + assertEquals(200, response.getStatusCode()); + assertEquals(phoneNumber, response.getValue().getPhoneNumber()); + assertEquals(COUNTRY_CODE, response.getValue().getCountryCode()); + }) + .verifyComplete(); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void listPurchasedPhoneNumbers(HttpClient httpClient) { + StepVerifier.create( + this.getClientWithConnectionString(httpClient, "listPurchasedPhoneNumbers") + .listPurchasedPhoneNumbers() + .next()) + .assertNext((PurchasedPhoneNumber number) -> { + assertNotNull(number.getPhoneNumber()); + assertEquals(COUNTRY_CODE, number.getCountryCode()); + }) + .verifyComplete(); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable(named = "COMMUNICATION_SKIP_INT_PHONENUMBERS_TEST", matches = "(?i)(true)") + public void beginSearchAvailablePhoneNumbers(HttpClient httpClient) { + PhoneNumbersAsyncClient client = this.getClientWithConnectionString(httpClient, + "beginSearchAvailablePhoneNumbers"); + StepVerifier.create( + beginSearchAvailablePhoneNumbersHelper(client, true).last() + .flatMap((AsyncPollResponse result) -> { + return result.getFinalResult(); + })) + .assertNext((PhoneNumberSearchResult searchResult) -> { + assertEquals(searchResult.getPhoneNumbers().size(), 1); + assertNotNull(searchResult.getSearchId()); + }) + .verifyComplete(); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable(named = "COMMUNICATION_SKIP_INT_PHONENUMBERS_TEST", matches = "(?i)(true)") + public void beginSearchAvailablePhoneNumbersWithoutOptions(HttpClient httpClient) { + PhoneNumbersAsyncClient client = this.getClientWithConnectionString(httpClient, + "getPurchasedPhoneNumberForCapabilities"); + StepVerifier.create( + beginSearchAvailablePhoneNumbersHelper(client, false).last() + .flatMap((AsyncPollResponse result) -> { + return result.getFinalResult(); + })) + .assertNext((PhoneNumberSearchResult searchResult) -> { + assertEquals(searchResult.getPhoneNumbers().size(), 1); + assertNotNull(searchResult.getSearchId()); + }) + .verifyComplete(); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable(named = "SKIP_LIVE_TEST", matches = "(?i)(true)") + public void beginPurchaseandReleasePhoneNumbers(HttpClient httpClient) { + PhoneNumbersAsyncClient client = this.getClientWithConnectionString(httpClient, + "getPurchasedPhoneNumberForCapabilities"); + StepVerifier.create( + beginSearchAvailablePhoneNumbersHelper(client, true).last() + .flatMap((AsyncPollResponse result) -> { + return result.getFinalResult() + .flatMap((PhoneNumberSearchResult searchResult) -> { + String phoneNumber = searchResult + .getPhoneNumbers() + .get(0); + return beginPurchasePhoneNumbersHelper( + client, + searchResult.getSearchId()) + .last() + .flatMap(( + AsyncPollResponse purchaseResult) -> { + assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, + purchaseResult.getStatus()); + return beginReleasePhoneNumberHelper( + client, + phoneNumber) + .last(); + }); + }); + })) + .assertNext((AsyncPollResponse releaseResult) -> { + assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, + releaseResult.getStatus()); + + }) + .verifyComplete(); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable(named = "COMMUNICATION_SKIP_INT_PHONENUMBERS_TEST", matches = "(?i)(true)") + @DisabledIfEnvironmentVariable(named = "SKIP_UPDATE_CAPABILITIES_LIVE_TESTS", matches = "(?i)(true)") + public void beginUpdatePhoneNumberCapabilities(HttpClient httpClient) { + String phoneNumber = getTestPhoneNumber(); + PhoneNumbersAsyncClient client = this.getClientWithConnectionString(httpClient, + "getPurchasedPhoneNumberForCapabilities"); + StepVerifier.create( + client.getPurchasedPhoneNumberWithResponse(phoneNumber) + .flatMap(responseAcquiredPhone -> { + PhoneNumberCapabilities capabilities = new PhoneNumberCapabilities(); + capabilities.setCalling(responseAcquiredPhone.getValue() + .getCapabilities() + .getCalling() == PhoneNumberCapabilityType.INBOUND + ? PhoneNumberCapabilityType.OUTBOUND + : PhoneNumberCapabilityType.INBOUND); + capabilities.setSms(responseAcquiredPhone.getValue() + .getCapabilities() + .getSms() == PhoneNumberCapabilityType.INBOUND_OUTBOUND + ? PhoneNumberCapabilityType.OUTBOUND + : PhoneNumberCapabilityType.INBOUND_OUTBOUND); + return beginUpdatePhoneNumberCapabilitiesHelper(client, + phoneNumber, capabilities) + .last() + .flatMap((AsyncPollResponse result) -> { + assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, + result.getStatus()); + assertEquals(PhoneNumberOperationStatus.SUCCEEDED, + result.getValue() + .getStatus()); + return result.getFinalResult(); + }); + })) + .assertNext(Assertions::assertNotNull) + .verifyComplete(); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getPurchasedPhoneNumberNullNumber(HttpClient httpClient) { + StepVerifier.create( + this.getClientWithConnectionString(httpClient, "getPurchasedPhoneNumberNullNumber") + .getPurchasedPhoneNumber(null)) + .verifyError(); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getPurchasedPhoneNumberWithResponseNullNumber(HttpClient httpClient) { + StepVerifier.create( + this.getClientWithConnectionString(httpClient, + "getPurchasedPhoneNumberWithResponseNullNumber") + .getPurchasedPhoneNumberWithResponse(null)) + .verifyError(); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void beginSearchAvailablePhoneNumbersNullCountryCode(HttpClient httpClient) { + StepVerifier.create( + this.getClientWithConnectionString(httpClient, + "beginSearchAvailablePhoneNumbersNullCountryCode") + .beginSearchAvailablePhoneNumbers(null, PhoneNumberType.TOLL_FREE, + PhoneNumberAssignmentType.APPLICATION, null, null)) + .verifyError(); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void beginUpdatePhoneNumberCapabilitiesNullPhoneNumber(HttpClient httpClient) { + StepVerifier.create( + this.getClientWithConnectionString(httpClient, + "beginUpdatePhoneNumberCapabilitiesNullPhoneNumber") + .beginUpdatePhoneNumberCapabilities(null, + new PhoneNumberCapabilities())) + .verifyError(); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void beginUpdatePhoneNumberCapabilitiesUnauthorizedPhoneNumber(HttpClient httpClient) { + PhoneNumberCapabilities capabilities = new PhoneNumberCapabilities(); + capabilities.setCalling(PhoneNumberCapabilityType.INBOUND); + StepVerifier.create( + this.getClientWithConnectionString(httpClient, + "beginUpdatePhoneNumberCapabilitiesUnauthorizedPhoneNumber") + .beginUpdatePhoneNumberCapabilities("+14255555111", capabilities)) + .verifyError(); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void beginUpdatePhoneNumberCapabilitiesInvalidPhoneNumber(HttpClient httpClient) { + PhoneNumberCapabilities capabilities = new PhoneNumberCapabilities(); + capabilities.setCalling(PhoneNumberCapabilityType.INBOUND); + StepVerifier.create( + this.getClientWithConnectionString(httpClient, + "beginUpdatePhoneNumberCapabilitiesInvalidPhoneNumber") + .beginUpdatePhoneNumberCapabilities("invalid-phone-number", + capabilities)) + .verifyError(); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getTollFreeAreaCodesWithAAD(HttpClient httpClient) { + StepVerifier.create( + this.getClientWithManagedIdentity(httpClient, "listAvailableTollFreeAreaCodes") + .listAvailableTollFreeAreaCodes("US", + PhoneNumberAssignmentType.APPLICATION) + .next()) + .expectAccessibleContext(); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getGeographicAreaCodesWithAAD(HttpClient httpClient) { + PhoneNumberLocality locality = this.getClientWithConnectionString(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", null).blockFirst(); + StepVerifier.create( + this.getClientWithManagedIdentity(httpClient, "listAvailableGeographicAreaCodes") + .listAvailableGeographicAreaCodes("US", + PhoneNumberAssignmentType.PERSON, + locality.getLocalizedName(), + locality.getAdministrativeDivision() + .getAbbreviatedName()) + .next()) + .assertNext((PhoneNumberAreaCode areaCodes) -> { + assertNotNull(areaCodes); + }) + .verifyComplete(); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getCountriesWithAAD(HttpClient httpClient) { + StepVerifier.create( + this.getClientWithManagedIdentity(httpClient, "listAvailableCountries") + .listAvailableCountries().next()) + .assertNext((PhoneNumberCountry country) -> { + assertNotNull(country); + }) + .verifyComplete(); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getLocalitiesWithAAD(HttpClient httpClient) { + StepVerifier.create( + this.getClientWithManagedIdentity(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", null).next()) + .assertNext((PhoneNumberLocality locality) -> { + assertNotNull(locality); + }) + .verifyComplete(); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getLocalitiesAdministrativeDivisionWithAAD(HttpClient httpClient) { + PhoneNumberLocality locality = this.getClientWithConnectionString(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", null).blockFirst(); + StepVerifier.create( + this.getClientWithManagedIdentity(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", + locality.getAdministrativeDivision() + .getAbbreviatedName()) + .next()) + .assertNext((PhoneNumberLocality localityWithAD) -> { + assertNotNull(localityWithAD); + assertEquals(localityWithAD.getAdministrativeDivision().getAbbreviatedName(), + locality.getAdministrativeDivision().getAbbreviatedName()); + }) + .verifyComplete(); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getOfferingsWithAAD(HttpClient httpClient) { + StepVerifier.create( + this.getClientWithManagedIdentity(httpClient, "listAvailableOfferings") + .listAvailableOfferings("US", null, null).next()) + .assertNext((PhoneNumberOffering offering) -> { + assertNotNull(offering); + }) + .verifyComplete(); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getTollFreeAreaCodes(HttpClient httpClient) { + StepVerifier.create( + this.getClientWithConnectionString(httpClient, "listAvailableTollFreeAreaCodes") + .listAvailableTollFreeAreaCodes("US", + PhoneNumberAssignmentType.APPLICATION) + .next()) + .expectAccessibleContext(); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getGeographicAreaCodes(HttpClient httpClient) { + PhoneNumberLocality locality = this.getClientWithConnectionString(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", null).blockFirst(); + StepVerifier.create( + this.getClientWithConnectionString(httpClient, "listAvailableGeographicAreaCodes") + .listAvailableGeographicAreaCodes("US", + PhoneNumberAssignmentType.PERSON, + locality.getLocalizedName(), + locality.getAdministrativeDivision() + .getAbbreviatedName()) + .next()) + .assertNext((PhoneNumberAreaCode areaCodes) -> { + assertNotNull(areaCodes); + }) + .verifyComplete(); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getCountries(HttpClient httpClient) { + StepVerifier.create( + this.getClientWithConnectionString(httpClient, "listAvailableCountries") + .listAvailableCountries() + .next()) + .assertNext((PhoneNumberCountry country) -> { + assertNotNull(country); + }) + .verifyComplete(); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getLocalities(HttpClient httpClient) { + StepVerifier.create( + this.getClientWithConnectionString(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", null).next()) + .assertNext((PhoneNumberLocality locality) -> { + assertNotNull(locality); + }) + .verifyComplete(); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getLocalitiesAdministrativeDivision(HttpClient httpClient) { + String localityAdministraiveDivision = this + .getClientWithConnectionString(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", null).blockFirst().getAdministrativeDivision() + .getAbbreviatedName(); + StepVerifier.create( + this.getClientWithConnectionString(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", localityAdministraiveDivision).next()) + .assertNext((PhoneNumberLocality locality) -> { + assertNotNull(locality); + assertEquals(locality.getAdministrativeDivision().getAbbreviatedName(), + localityAdministraiveDivision); + }) + .verifyComplete(); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getOfferings(HttpClient httpClient) { + StepVerifier.create( + this.getClientWithConnectionString(httpClient, "listAvailableOfferings") + .listAvailableOfferings("US", null, null).next()) + .assertNext((PhoneNumberOffering offering) -> { + assertNotNull(offering); + }) + .verifyComplete(); + } + + private PollerFlux beginSearchAvailablePhoneNumbersHelper( + PhoneNumbersAsyncClient client, boolean withOptions) { + PhoneNumberCapabilities capabilities = new PhoneNumberCapabilities(); + capabilities.setCalling(PhoneNumberCapabilityType.INBOUND); + capabilities.setSms(PhoneNumberCapabilityType.INBOUND_OUTBOUND); + PhoneNumberSearchOptions searchOptions = new PhoneNumberSearchOptions().setQuantity(1); + + if (withOptions) { + return setPollInterval(client + .beginSearchAvailablePhoneNumbers( + COUNTRY_CODE, + PhoneNumberType.TOLL_FREE, + PhoneNumberAssignmentType.APPLICATION, + capabilities, + searchOptions)); + } + return setPollInterval(client + .beginSearchAvailablePhoneNumbers( + COUNTRY_CODE, + PhoneNumberType.TOLL_FREE, + PhoneNumberAssignmentType.APPLICATION, + capabilities)); + } + + private PollerFlux beginPurchasePhoneNumbersHelper( + PhoneNumbersAsyncClient client, String searchId) { + return setPollInterval(client + .beginPurchasePhoneNumbers(searchId)); + } + + private PollerFlux beginReleasePhoneNumberHelper( + PhoneNumbersAsyncClient client, String phoneNumber) { + return setPollInterval(client + .beginReleasePhoneNumber(phoneNumber)); + } + + private PollerFlux beginUpdatePhoneNumberCapabilitiesHelper( + PhoneNumbersAsyncClient client, String phoneNumber, PhoneNumberCapabilities capabilities) { + + return setPollInterval(client + .beginUpdatePhoneNumberCapabilities(phoneNumber, capabilities)); + } + + private PollerFlux setPollInterval(PollerFlux pollerFlux) { + return interceptorManager.isPlaybackMode() + ? pollerFlux.setPollInterval(Duration.ofMillis(1)) + : pollerFlux.setPollInterval(Duration.ofSeconds(1)); + } + + private PhoneNumbersAsyncClient getClientWithConnectionString(HttpClient httpClient, String testName) { + PhoneNumbersClientBuilder builder = super.getClientBuilderWithConnectionString(httpClient); + return addLoggingPolicy(builder, testName).buildAsyncClient(); + } + + private PhoneNumbersAsyncClient getClientWithManagedIdentity(HttpClient httpClient, String testName) { + PhoneNumbersClientBuilder builder = super.getClientBuilderUsingManagedIdentity(httpClient); + return addLoggingPolicy(builder, testName).buildAsyncClient(); + } } diff --git a/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersClientIntegrationTest.java b/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersClientIntegrationTest.java index c3c0863ce838..ecdd36bc0616 100644 --- a/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersClientIntegrationTest.java +++ b/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersClientIntegrationTest.java @@ -39,390 +39,390 @@ public class PhoneNumbersClientIntegrationTest extends PhoneNumbersIntegrationTestBase { - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getPurchasedPhoneNumber(HttpClient httpClient) { - String phoneNumber = redactIfPlaybackMode(getTestPhoneNumber()); - PurchasedPhoneNumber number = this - .getClientWithConnectionString(httpClient, "getPurchasedPhoneNumberSync") - .getPurchasedPhoneNumber(phoneNumber); - assertEquals(phoneNumber, number.getPhoneNumber()); - assertEquals(COUNTRY_CODE, number.getCountryCode()); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getPurchasedPhoneNumberWithAAD(HttpClient httpClient) { - String phoneNumber = redactIfPlaybackMode(getTestPhoneNumber()); - PurchasedPhoneNumber number = this - .getClientWithManagedIdentity(httpClient, "getPurchasedPhoneNumberWithAADSync") - .getPurchasedPhoneNumber(phoneNumber); - assertEquals(phoneNumber, number.getPhoneNumber()); - assertEquals(COUNTRY_CODE, number.getCountryCode()); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getPurchasedPhoneNumberWithResponse(HttpClient httpClient) { - String phoneNumber = redactIfPlaybackMode(getTestPhoneNumber()); - Response response = this - .getClientWithConnectionString(httpClient, "getPurchasedPhoneNumberWithResponseSync") - .getPurchasedPhoneNumberWithResponse(phoneNumber, Context.NONE); - PurchasedPhoneNumber number = response.getValue(); - assertEquals(200, response.getStatusCode()); - assertEquals(phoneNumber, number.getPhoneNumber()); - assertEquals(COUNTRY_CODE, number.getCountryCode()); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void listPurchasedPhoneNumbers(HttpClient httpClient) { - PagedIterable numbers = this - .getClientWithConnectionString(httpClient, "listPurchasedPhoneNumbersSync") - .listPurchasedPhoneNumbers(Context.NONE); - PurchasedPhoneNumber number = numbers.iterator().next(); - assertNotNull(number.getPhoneNumber()); - assertEquals(COUNTRY_CODE, number.getCountryCode()); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void listPurchasedPhoneNumbersWithoutContext(HttpClient httpClient) { - PagedIterable numbers = this - .getClientWithConnectionString(httpClient, "listPurchasedPhoneNumbersSync") - .listPurchasedPhoneNumbers(); - PurchasedPhoneNumber number = numbers.iterator().next(); - assertNotNull(number.getPhoneNumber()); - assertEquals(COUNTRY_CODE, number.getCountryCode()); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable(named = "COMMUNICATION_SKIP_INT_PHONENUMBERS_TEST", matches = "(?i)(true)") - public void beginSearchAvailablePhoneNumbers(HttpClient httpClient) { - SyncPoller poller = beginSearchAvailablePhoneNumbersHelper( - httpClient, "beginSearchAvailablePhoneNumbersSync", true); - PollResponse response = poller.waitForCompletion(); - if (LongRunningOperationStatus.SUCCESSFULLY_COMPLETED == response.getStatus()) { - PhoneNumberSearchResult searchResult = poller.getFinalResult(); - assertEquals(searchResult.getPhoneNumbers().size(), 1); - assertNotNull(searchResult.getSearchId()); - } else { - fail("Long Running Operation Status was not successfully completed"); - } - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable(named = "SKIP_LIVE_TEST", matches = "(?i)(true)") - public void beginPurchaseandReleasePhoneNumbersWithoutContext(HttpClient httpClient) { - SyncPoller poller = beginSearchAvailablePhoneNumbersHelper( - httpClient, - "beginPurchaseandReleasePhoneNumbers_beginSearchAvailablePhoneNumbersWithoutContextSync", - false); - PollResponse response = poller.waitForCompletion(); - if (LongRunningOperationStatus.SUCCESSFULLY_COMPLETED == response.getStatus()) { - PhoneNumberSearchResult searchResult = poller.getFinalResult(); - String phoneNumber = searchResult.getPhoneNumbers().get(0); - PollResponse purchaseOperationResponse = beginPurchasePhoneNumbersHelper( - httpClient, - searchResult.getSearchId(), "beginPurchasePhoneNumbersWithoutContextSync", - false) - .waitForCompletion(); - assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, - purchaseOperationResponse.getStatus()); - PollResponse releaseOperationResponse = beginReleasePhoneNumberHelper( - httpClient, - phoneNumber, "beginReleasePhoneNumberWithoutContextSync", false) - .waitForCompletion(); - assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, - releaseOperationResponse.getStatus()); - } else { - fail("Long Running Operation Status was not successfully completed"); - } - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable(named = "SKIP_LIVE_TEST", matches = "(?i)(true)") - public void beginPurchaseandReleasePhoneNumbers(HttpClient httpClient) { - SyncPoller poller = beginSearchAvailablePhoneNumbersHelper( - httpClient, "beginPurchaseandReleasePhoneNumbers_beginSearchAvailablePhoneNumbersSync", - true); - PollResponse response = poller.waitForCompletion(); - if (LongRunningOperationStatus.SUCCESSFULLY_COMPLETED == response.getStatus()) { - PhoneNumberSearchResult searchResult = poller.getFinalResult(); - String phoneNumber = searchResult.getPhoneNumbers().get(0); - PollResponse purchaseOperationResponse = beginPurchasePhoneNumbersHelper( - httpClient, - searchResult.getSearchId(), "beginPurchasePhoneNumbersSync", true) - .waitForCompletion(); - assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, - purchaseOperationResponse.getStatus()); - PollResponse releaseOperationResponse = beginReleasePhoneNumberHelper( - httpClient, - phoneNumber, "beginReleasePhoneNumberSync", true).waitForCompletion(); - assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, - releaseOperationResponse.getStatus()); - } else { - fail("Long Running Operation Status was not successfully completed"); - } - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable(named = "COMMUNICATION_SKIP_INT_PHONENUMBERS_TEST", matches = "(?i)(true)") - public void beginUpdatePhoneNumberCapabilitiesWithoutContext(HttpClient httpClient) { - String phoneNumber = getTestPhoneNumber(); - PollResponse result = beginUpdatePhoneNumberCapabilitiesHelper(httpClient, - phoneNumber, - "beginUpdatePhoneNumberCapabilitiesWithoutContextSync", false).waitForCompletion(); - assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, result.getStatus()); - assertEquals(PhoneNumberOperationStatus.SUCCEEDED, result.getValue().getStatus()); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable(named = "COMMUNICATION_SKIP_INT_PHONENUMBERS_TEST", matches = "(?i)(true)") - @DisabledIfEnvironmentVariable(named = "SKIP_UPDATE_CAPABILITIES_LIVE_TESTS", matches = "(?i)(true)") - public void beginUpdatePhoneNumberCapabilities(HttpClient httpClient) { - String phoneNumber = getTestPhoneNumber(); - PollResponse result = beginUpdatePhoneNumberCapabilitiesHelper(httpClient, - phoneNumber, - "beginUpdatePhoneNumberCapabilities", true).waitForCompletion(); - assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, result.getStatus()); - assertEquals(PhoneNumberOperationStatus.SUCCEEDED, result.getValue().getStatus()); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getTollFreeAreaCodes(HttpClient httpClient) { - PagedIterable areaCodesResult = this - .getClientWithConnectionString(httpClient, "listAvailableTollFreeAreaCodes") - .listAvailableTollFreeAreaCodes("US"); - String[] expectedAreaCodes = { "888", "877", "866", "855", "844", "800", "833", "88" }; - for (PhoneNumberAreaCode areaCode : areaCodesResult) { - assertTrue(Arrays.asList(expectedAreaCodes).contains(areaCode)); - } - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getGeographicAreaCodes(HttpClient httpClient) { - PhoneNumberLocality locality = this.getClientWithConnectionString(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", null).iterator().next(); - PagedIterable areaCodesResult = this - .getClientWithConnectionString(httpClient, "listAvailableGeographicAreaCodes") - .listAvailableGeographicAreaCodes("US", PhoneNumberAssignmentType.PERSON, - locality.getLocalizedName(), - locality.getAdministrativeDivision().getAbbreviatedName()); - PhoneNumberAreaCode areaCodes = areaCodesResult.iterator().next(); - assertNotNull(areaCodes); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getCountries(HttpClient httpClient) { - PagedIterable countriesResult = this - .getClientWithConnectionString(httpClient, "listAvailableCountries") - .listAvailableCountries(); - PhoneNumberCountry country = countriesResult.iterator().next(); - assertNotNull(country); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getLocalities(HttpClient httpClient) { - PagedIterable localitiesResult = this - .getClientWithConnectionString(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", null); - PhoneNumberLocality locality = localitiesResult.iterator().next(); - assertNotNull(locality); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getLocalitiesWithAdministrativeDivision(HttpClient httpClient) { - String localityAdministraiveDivision = this - .getClientWithConnectionString(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", null).iterator().next().getAdministrativeDivision() - .getAbbreviatedName(); - PagedIterable localitiesResult = this - .getClientWithConnectionString(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", localityAdministraiveDivision); - PhoneNumberLocality locality = localitiesResult.iterator().next(); - assertNotNull(locality); - assertEquals(locality.getAdministrativeDivision().getAbbreviatedName(), localityAdministraiveDivision); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getOfferings(HttpClient httpClient) { - PagedIterable offeringsResult = this - .getClientWithConnectionString(httpClient, "listAvailableOfferings") - .listAvailableOfferings("US", null, null); - PhoneNumberOffering offering = offeringsResult.iterator().next(); - assertNotNull(offering); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getTollFreeAreaCodesWithAAD(HttpClient httpClient) { - PagedIterable areaCodesResult = this - .getClientWithManagedIdentity(httpClient, "listAvailableTollFreeAreaCodes") - .listAvailableTollFreeAreaCodes("US"); - String[] expectedAreaCodes = { "888", "877", "866", "855", "844", "800", "833", "88" }; - for (PhoneNumberAreaCode areaCode : areaCodesResult) { - assertTrue(Arrays.asList(expectedAreaCodes).contains(areaCode)); - } - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getGeographicAreaCodesWithAAD(HttpClient httpClient) { - PhoneNumberLocality locality = this.getClientWithConnectionString(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", null).iterator().next(); - PagedIterable areaCodesResult = this - .getClientWithManagedIdentity(httpClient, "listAvailableGeographicAreaCodes") - .listAvailableGeographicAreaCodes("US", PhoneNumberAssignmentType.PERSON, - locality.getLocalizedName(), - locality.getAdministrativeDivision().getAbbreviatedName()); - PhoneNumberAreaCode areaCodes = areaCodesResult.iterator().next(); - assertNotNull(areaCodes); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getCountriesWithAAD(HttpClient httpClient) { - PagedIterable countriesResult = this - .getClientWithManagedIdentity(httpClient, "listAvailableCountries") - .listAvailableCountries(); - PhoneNumberCountry country = countriesResult.iterator().next(); - assertNotNull(country); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getLocalitiesWithAAD(HttpClient httpClient) { - PagedIterable localitiesResult = this - .getClientWithManagedIdentity(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", null); - PhoneNumberLocality locality = localitiesResult.iterator().next(); - assertNotNull(locality); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getLocalitiesWithAdministrativeDivisionWithAAD(HttpClient httpClient) { - PagedIterable localities = this - .getClientWithManagedIdentity(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", null); - PhoneNumberLocality localityWithAD = localities.iterator().next(); - - PagedIterable localitiesResult = this - .getClientWithManagedIdentity(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", - localityWithAD.getAdministrativeDivision().getAbbreviatedName()); - PhoneNumberLocality locality = localitiesResult.iterator().next(); - assertNotNull(locality); - assertEquals(locality.getAdministrativeDivision().getAbbreviatedName(), - localityWithAD.getAdministrativeDivision().getAbbreviatedName()); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getOfferingsWithAAD(HttpClient httpClient) { - PagedIterable offeringsResult = this - .getClientWithManagedIdentity(httpClient, "listAvailableOfferings") - .listAvailableOfferings("US", null, null); - PhoneNumberOffering offering = offeringsResult.iterator().next(); - assertNotNull(offering); - } - - private SyncPoller beginSearchAvailablePhoneNumbersHelper( - HttpClient httpClient, String testName, boolean withContext) { - PhoneNumberCapabilities capabilities = new PhoneNumberCapabilities(); - capabilities.setCalling(PhoneNumberCapabilityType.INBOUND); - capabilities.setSms(PhoneNumberCapabilityType.INBOUND_OUTBOUND); - PhoneNumberSearchOptions searchOptions = new PhoneNumberSearchOptions().setQuantity(1); - - if (withContext) { - return setPollInterval(getClientWithConnectionString(httpClient, testName) - .beginSearchAvailablePhoneNumbers( - COUNTRY_CODE, - PhoneNumberType.TOLL_FREE, - PhoneNumberAssignmentType.APPLICATION, - capabilities, - searchOptions, - Context.NONE)); - } - return setPollInterval( - getClientWithConnectionString(httpClient, testName).beginSearchAvailablePhoneNumbers( - COUNTRY_CODE, - PhoneNumberType.TOLL_FREE, - PhoneNumberAssignmentType.APPLICATION, - capabilities)); - } - - private SyncPoller beginPurchasePhoneNumbersHelper( - HttpClient httpClient, String searchId, String testName, boolean withContext) { - if (withContext) { - return setPollInterval(this.getClientWithConnectionString(httpClient, testName) - .beginPurchasePhoneNumbers(searchId, Context.NONE)); - } - return setPollInterval(this.getClientWithConnectionString(httpClient, testName) - .beginPurchasePhoneNumbers(searchId)); - } - - private SyncPoller beginReleasePhoneNumberHelper( - HttpClient httpClient, String phoneNumber, String testName, boolean withContext) { - if (getTestMode() == TestMode.PLAYBACK) { - phoneNumber = "+REDACTED"; - } - if (withContext) { - return setPollInterval(this.getClientWithConnectionString(httpClient, testName) - .beginReleasePhoneNumber(phoneNumber, Context.NONE)); - } - return setPollInterval(this.getClientWithConnectionString(httpClient, testName) - .beginReleasePhoneNumber(phoneNumber)); - } - - private SyncPoller beginUpdatePhoneNumberCapabilitiesHelper( - HttpClient httpClient, String phoneNumber, String testName, boolean withContext) { - PhoneNumbersClient client = this.getClientWithConnectionString(httpClient, testName); - Response responseAcquiredPhone = client.getPurchasedPhoneNumberWithResponse( - phoneNumber, - Context.NONE); - PhoneNumberCapabilities capabilities = new PhoneNumberCapabilities(); - capabilities.setCalling( - responseAcquiredPhone.getValue().getCapabilities() - .getCalling() == PhoneNumberCapabilityType.INBOUND - ? PhoneNumberCapabilityType.OUTBOUND - : PhoneNumberCapabilityType.INBOUND); - capabilities.setSms(responseAcquiredPhone.getValue().getCapabilities() - .getSms() == PhoneNumberCapabilityType.INBOUND_OUTBOUND - ? PhoneNumberCapabilityType.OUTBOUND - : PhoneNumberCapabilityType.INBOUND_OUTBOUND); - if (withContext) { - return setPollInterval(client.beginUpdatePhoneNumberCapabilities(phoneNumber, capabilities, - Context.NONE)); - } - return setPollInterval(client.beginUpdatePhoneNumberCapabilities(phoneNumber, capabilities)); - } - - private SyncPoller setPollInterval(SyncPoller syncPoller) { - return interceptorManager.isPlaybackMode() - ? syncPoller.setPollInterval(Duration.ofMillis(1)) - : syncPoller.setPollInterval(Duration.ofSeconds(1)); - } - - private PhoneNumbersClient getClientWithConnectionString(HttpClient httpClient, String testName) { - PhoneNumbersClientBuilder builder = super.getClientBuilderWithConnectionString(httpClient); - return addLoggingPolicy(builder, testName).buildClient(); - } - - private PhoneNumbersClient getClientWithManagedIdentity(HttpClient httpClient, String testName) { - PhoneNumbersClientBuilder builder = super.getClientBuilderUsingManagedIdentity(httpClient); - return addLoggingPolicy(builder, testName).buildClient(); - } + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getPurchasedPhoneNumber(HttpClient httpClient) { + String phoneNumber = redactIfPlaybackMode(getTestPhoneNumber()); + PurchasedPhoneNumber number = this + .getClientWithConnectionString(httpClient, "getPurchasedPhoneNumberSync") + .getPurchasedPhoneNumber(phoneNumber); + assertEquals(phoneNumber, number.getPhoneNumber()); + assertEquals(COUNTRY_CODE, number.getCountryCode()); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getPurchasedPhoneNumberWithAAD(HttpClient httpClient) { + String phoneNumber = redactIfPlaybackMode(getTestPhoneNumber()); + PurchasedPhoneNumber number = this + .getClientWithManagedIdentity(httpClient, "getPurchasedPhoneNumberWithAADSync") + .getPurchasedPhoneNumber(phoneNumber); + assertEquals(phoneNumber, number.getPhoneNumber()); + assertEquals(COUNTRY_CODE, number.getCountryCode()); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getPurchasedPhoneNumberWithResponse(HttpClient httpClient) { + String phoneNumber = redactIfPlaybackMode(getTestPhoneNumber()); + Response response = this + .getClientWithConnectionString(httpClient, "getPurchasedPhoneNumberWithResponseSync") + .getPurchasedPhoneNumberWithResponse(phoneNumber, Context.NONE); + PurchasedPhoneNumber number = response.getValue(); + assertEquals(200, response.getStatusCode()); + assertEquals(phoneNumber, number.getPhoneNumber()); + assertEquals(COUNTRY_CODE, number.getCountryCode()); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void listPurchasedPhoneNumbers(HttpClient httpClient) { + PagedIterable numbers = this + .getClientWithConnectionString(httpClient, "listPurchasedPhoneNumbersSync") + .listPurchasedPhoneNumbers(Context.NONE); + PurchasedPhoneNumber number = numbers.iterator().next(); + assertNotNull(number.getPhoneNumber()); + assertEquals(COUNTRY_CODE, number.getCountryCode()); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void listPurchasedPhoneNumbersWithoutContext(HttpClient httpClient) { + PagedIterable numbers = this + .getClientWithConnectionString(httpClient, "listPurchasedPhoneNumbersSync") + .listPurchasedPhoneNumbers(); + PurchasedPhoneNumber number = numbers.iterator().next(); + assertNotNull(number.getPhoneNumber()); + assertEquals(COUNTRY_CODE, number.getCountryCode()); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable(named = "COMMUNICATION_SKIP_INT_PHONENUMBERS_TEST", matches = "(?i)(true)") + public void beginSearchAvailablePhoneNumbers(HttpClient httpClient) { + SyncPoller poller = beginSearchAvailablePhoneNumbersHelper( + httpClient, "beginSearchAvailablePhoneNumbersSync", true); + PollResponse response = poller.waitForCompletion(); + if (LongRunningOperationStatus.SUCCESSFULLY_COMPLETED == response.getStatus()) { + PhoneNumberSearchResult searchResult = poller.getFinalResult(); + assertEquals(searchResult.getPhoneNumbers().size(), 1); + assertNotNull(searchResult.getSearchId()); + } else { + fail("Long Running Operation Status was not successfully completed"); + } + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable(named = "SKIP_LIVE_TEST", matches = "(?i)(true)") + public void beginPurchaseandReleasePhoneNumbersWithoutContext(HttpClient httpClient) { + SyncPoller poller = beginSearchAvailablePhoneNumbersHelper( + httpClient, + "beginPurchaseandReleasePhoneNumbers_beginSearchAvailablePhoneNumbersWithoutContextSync", + false); + PollResponse response = poller.waitForCompletion(); + if (LongRunningOperationStatus.SUCCESSFULLY_COMPLETED == response.getStatus()) { + PhoneNumberSearchResult searchResult = poller.getFinalResult(); + String phoneNumber = searchResult.getPhoneNumbers().get(0); + PollResponse purchaseOperationResponse = beginPurchasePhoneNumbersHelper( + httpClient, + searchResult.getSearchId(), "beginPurchasePhoneNumbersWithoutContextSync", + false) + .waitForCompletion(); + assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, + purchaseOperationResponse.getStatus()); + PollResponse releaseOperationResponse = beginReleasePhoneNumberHelper( + httpClient, + phoneNumber, "beginReleasePhoneNumberWithoutContextSync", false) + .waitForCompletion(); + assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, + releaseOperationResponse.getStatus()); + } else { + fail("Long Running Operation Status was not successfully completed"); + } + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable(named = "SKIP_LIVE_TEST", matches = "(?i)(true)") + public void beginPurchaseandReleasePhoneNumbers(HttpClient httpClient) { + SyncPoller poller = beginSearchAvailablePhoneNumbersHelper( + httpClient, "beginPurchaseandReleasePhoneNumbers_beginSearchAvailablePhoneNumbersSync", + true); + PollResponse response = poller.waitForCompletion(); + if (LongRunningOperationStatus.SUCCESSFULLY_COMPLETED == response.getStatus()) { + PhoneNumberSearchResult searchResult = poller.getFinalResult(); + String phoneNumber = searchResult.getPhoneNumbers().get(0); + PollResponse purchaseOperationResponse = beginPurchasePhoneNumbersHelper( + httpClient, + searchResult.getSearchId(), "beginPurchasePhoneNumbersSync", true) + .waitForCompletion(); + assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, + purchaseOperationResponse.getStatus()); + PollResponse releaseOperationResponse = beginReleasePhoneNumberHelper( + httpClient, + phoneNumber, "beginReleasePhoneNumberSync", true).waitForCompletion(); + assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, + releaseOperationResponse.getStatus()); + } else { + fail("Long Running Operation Status was not successfully completed"); + } + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable(named = "COMMUNICATION_SKIP_INT_PHONENUMBERS_TEST", matches = "(?i)(true)") + public void beginUpdatePhoneNumberCapabilitiesWithoutContext(HttpClient httpClient) { + String phoneNumber = getTestPhoneNumber(); + PollResponse result = beginUpdatePhoneNumberCapabilitiesHelper(httpClient, + phoneNumber, + "beginUpdatePhoneNumberCapabilitiesWithoutContextSync", false).waitForCompletion(); + assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, result.getStatus()); + assertEquals(PhoneNumberOperationStatus.SUCCEEDED, result.getValue().getStatus()); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable(named = "COMMUNICATION_SKIP_INT_PHONENUMBERS_TEST", matches = "(?i)(true)") + @DisabledIfEnvironmentVariable(named = "SKIP_UPDATE_CAPABILITIES_LIVE_TESTS", matches = "(?i)(true)") + public void beginUpdatePhoneNumberCapabilities(HttpClient httpClient) { + String phoneNumber = getTestPhoneNumber(); + PollResponse result = beginUpdatePhoneNumberCapabilitiesHelper(httpClient, + phoneNumber, + "beginUpdatePhoneNumberCapabilities", true).waitForCompletion(); + assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, result.getStatus()); + assertEquals(PhoneNumberOperationStatus.SUCCEEDED, result.getValue().getStatus()); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getTollFreeAreaCodes(HttpClient httpClient) { + PagedIterable areaCodesResult = this + .getClientWithConnectionString(httpClient, "listAvailableTollFreeAreaCodes") + .listAvailableTollFreeAreaCodes("US"); + String[] expectedAreaCodes = { "888", "877", "866", "855", "844", "800", "833", "88" }; + for (PhoneNumberAreaCode areaCode : areaCodesResult) { + assertTrue(Arrays.asList(expectedAreaCodes).contains(areaCode)); + } + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getGeographicAreaCodes(HttpClient httpClient) { + PhoneNumberLocality locality = this.getClientWithConnectionString(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", null).iterator().next(); + PagedIterable areaCodesResult = this + .getClientWithConnectionString(httpClient, "listAvailableGeographicAreaCodes") + .listAvailableGeographicAreaCodes("US", PhoneNumberAssignmentType.PERSON, + locality.getLocalizedName(), + locality.getAdministrativeDivision().getAbbreviatedName()); + PhoneNumberAreaCode areaCodes = areaCodesResult.iterator().next(); + assertNotNull(areaCodes); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getCountries(HttpClient httpClient) { + PagedIterable countriesResult = this + .getClientWithConnectionString(httpClient, "listAvailableCountries") + .listAvailableCountries(); + PhoneNumberCountry country = countriesResult.iterator().next(); + assertNotNull(country); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getLocalities(HttpClient httpClient) { + PagedIterable localitiesResult = this + .getClientWithConnectionString(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", null); + PhoneNumberLocality locality = localitiesResult.iterator().next(); + assertNotNull(locality); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getLocalitiesWithAdministrativeDivision(HttpClient httpClient) { + String localityAdministraiveDivision = this + .getClientWithConnectionString(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", null).iterator().next().getAdministrativeDivision() + .getAbbreviatedName(); + PagedIterable localitiesResult = this + .getClientWithConnectionString(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", localityAdministraiveDivision); + PhoneNumberLocality locality = localitiesResult.iterator().next(); + assertNotNull(locality); + assertEquals(locality.getAdministrativeDivision().getAbbreviatedName(), localityAdministraiveDivision); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getOfferings(HttpClient httpClient) { + PagedIterable offeringsResult = this + .getClientWithConnectionString(httpClient, "listAvailableOfferings") + .listAvailableOfferings("US", null, null); + PhoneNumberOffering offering = offeringsResult.iterator().next(); + assertNotNull(offering); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getTollFreeAreaCodesWithAAD(HttpClient httpClient) { + PagedIterable areaCodesResult = this + .getClientWithManagedIdentity(httpClient, "listAvailableTollFreeAreaCodes") + .listAvailableTollFreeAreaCodes("US"); + String[] expectedAreaCodes = { "888", "877", "866", "855", "844", "800", "833", "88" }; + for (PhoneNumberAreaCode areaCode : areaCodesResult) { + assertTrue(Arrays.asList(expectedAreaCodes).contains(areaCode)); + } + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getGeographicAreaCodesWithAAD(HttpClient httpClient) { + PhoneNumberLocality locality = this.getClientWithConnectionString(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", null).iterator().next(); + PagedIterable areaCodesResult = this + .getClientWithManagedIdentity(httpClient, "listAvailableGeographicAreaCodes") + .listAvailableGeographicAreaCodes("US", PhoneNumberAssignmentType.PERSON, + locality.getLocalizedName(), + locality.getAdministrativeDivision().getAbbreviatedName()); + PhoneNumberAreaCode areaCodes = areaCodesResult.iterator().next(); + assertNotNull(areaCodes); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getCountriesWithAAD(HttpClient httpClient) { + PagedIterable countriesResult = this + .getClientWithManagedIdentity(httpClient, "listAvailableCountries") + .listAvailableCountries(); + PhoneNumberCountry country = countriesResult.iterator().next(); + assertNotNull(country); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getLocalitiesWithAAD(HttpClient httpClient) { + PagedIterable localitiesResult = this + .getClientWithManagedIdentity(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", null); + PhoneNumberLocality locality = localitiesResult.iterator().next(); + assertNotNull(locality); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getLocalitiesWithAdministrativeDivisionWithAAD(HttpClient httpClient) { + PagedIterable localities = this + .getClientWithManagedIdentity(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", null); + PhoneNumberLocality localityWithAD = localities.iterator().next(); + + PagedIterable localitiesResult = this + .getClientWithManagedIdentity(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", + localityWithAD.getAdministrativeDivision().getAbbreviatedName()); + PhoneNumberLocality locality = localitiesResult.iterator().next(); + assertNotNull(locality); + assertEquals(locality.getAdministrativeDivision().getAbbreviatedName(), + localityWithAD.getAdministrativeDivision().getAbbreviatedName()); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getOfferingsWithAAD(HttpClient httpClient) { + PagedIterable offeringsResult = this + .getClientWithManagedIdentity(httpClient, "listAvailableOfferings") + .listAvailableOfferings("US", null, null); + PhoneNumberOffering offering = offeringsResult.iterator().next(); + assertNotNull(offering); + } + + private SyncPoller beginSearchAvailablePhoneNumbersHelper( + HttpClient httpClient, String testName, boolean withContext) { + PhoneNumberCapabilities capabilities = new PhoneNumberCapabilities(); + capabilities.setCalling(PhoneNumberCapabilityType.INBOUND); + capabilities.setSms(PhoneNumberCapabilityType.INBOUND_OUTBOUND); + PhoneNumberSearchOptions searchOptions = new PhoneNumberSearchOptions().setQuantity(1); + + if (withContext) { + return setPollInterval(getClientWithConnectionString(httpClient, testName) + .beginSearchAvailablePhoneNumbers( + COUNTRY_CODE, + PhoneNumberType.TOLL_FREE, + PhoneNumberAssignmentType.APPLICATION, + capabilities, + searchOptions, + Context.NONE)); + } + return setPollInterval( + getClientWithConnectionString(httpClient, testName).beginSearchAvailablePhoneNumbers( + COUNTRY_CODE, + PhoneNumberType.TOLL_FREE, + PhoneNumberAssignmentType.APPLICATION, + capabilities)); + } + + private SyncPoller beginPurchasePhoneNumbersHelper( + HttpClient httpClient, String searchId, String testName, boolean withContext) { + if (withContext) { + return setPollInterval(this.getClientWithConnectionString(httpClient, testName) + .beginPurchasePhoneNumbers(searchId, Context.NONE)); + } + return setPollInterval(this.getClientWithConnectionString(httpClient, testName) + .beginPurchasePhoneNumbers(searchId)); + } + + private SyncPoller beginReleasePhoneNumberHelper( + HttpClient httpClient, String phoneNumber, String testName, boolean withContext) { + if (getTestMode() == TestMode.PLAYBACK) { + phoneNumber = "+REDACTED"; + } + if (withContext) { + return setPollInterval(this.getClientWithConnectionString(httpClient, testName) + .beginReleasePhoneNumber(phoneNumber, Context.NONE)); + } + return setPollInterval(this.getClientWithConnectionString(httpClient, testName) + .beginReleasePhoneNumber(phoneNumber)); + } + + private SyncPoller beginUpdatePhoneNumberCapabilitiesHelper( + HttpClient httpClient, String phoneNumber, String testName, boolean withContext) { + PhoneNumbersClient client = this.getClientWithConnectionString(httpClient, testName); + Response responseAcquiredPhone = client.getPurchasedPhoneNumberWithResponse( + phoneNumber, + Context.NONE); + PhoneNumberCapabilities capabilities = new PhoneNumberCapabilities(); + capabilities.setCalling( + responseAcquiredPhone.getValue().getCapabilities() + .getCalling() == PhoneNumberCapabilityType.INBOUND + ? PhoneNumberCapabilityType.OUTBOUND + : PhoneNumberCapabilityType.INBOUND); + capabilities.setSms(responseAcquiredPhone.getValue().getCapabilities() + .getSms() == PhoneNumberCapabilityType.INBOUND_OUTBOUND + ? PhoneNumberCapabilityType.OUTBOUND + : PhoneNumberCapabilityType.INBOUND_OUTBOUND); + if (withContext) { + return setPollInterval(client.beginUpdatePhoneNumberCapabilities(phoneNumber, capabilities, + Context.NONE)); + } + return setPollInterval(client.beginUpdatePhoneNumberCapabilities(phoneNumber, capabilities)); + } + + private SyncPoller setPollInterval(SyncPoller syncPoller) { + return interceptorManager.isPlaybackMode() + ? syncPoller.setPollInterval(Duration.ofMillis(1)) + : syncPoller.setPollInterval(Duration.ofSeconds(1)); + } + + private PhoneNumbersClient getClientWithConnectionString(HttpClient httpClient, String testName) { + PhoneNumbersClientBuilder builder = super.getClientBuilderWithConnectionString(httpClient); + return addLoggingPolicy(builder, testName).buildClient(); + } + + private PhoneNumbersClient getClientWithManagedIdentity(HttpClient httpClient, String testName) { + PhoneNumbersClientBuilder builder = super.getClientBuilderUsingManagedIdentity(httpClient); + return addLoggingPolicy(builder, testName).buildClient(); + } } From 2c5eb13bf19df76115f60211732cfee75c375ab0 Mon Sep 17 00:00:00 2001 From: Sofia Robles Sandoval Date: Mon, 16 Oct 2023 11:02:28 -0600 Subject: [PATCH 06/11] Format issues --- ...honeNumbersAsyncClientIntegrationTest.java | 924 +++++++++--------- .../PhoneNumbersClientIntegrationTest.java | 772 +++++++-------- 2 files changed, 848 insertions(+), 848 deletions(-) diff --git a/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersAsyncClientIntegrationTest.java b/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersAsyncClientIntegrationTest.java index 03fde97f163b..6f8b8a15fc27 100644 --- a/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersAsyncClientIntegrationTest.java +++ b/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersAsyncClientIntegrationTest.java @@ -35,466 +35,466 @@ public class PhoneNumbersAsyncClientIntegrationTest extends PhoneNumbersIntegrationTestBase { - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getPurchasedPhoneNumber(HttpClient httpClient) { - String phoneNumber = redactIfPlaybackMode(getTestPhoneNumber()); - StepVerifier.create( - this.getClientWithConnectionString(httpClient, "getPurchasedPhoneNumber") - .getPurchasedPhoneNumber(phoneNumber)) - .assertNext((PurchasedPhoneNumber number) -> { - assertEquals(phoneNumber, number.getPhoneNumber()); - assertEquals(COUNTRY_CODE, number.getCountryCode()); - }) - .verifyComplete(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getPurchasedPhoneNumberWithAAD(HttpClient httpClient) { - String phoneNumber = redactIfPlaybackMode(getTestPhoneNumber()); - StepVerifier.create( - this.getClientWithManagedIdentity(httpClient, "getPurchasedPhoneNumberWithAAD") - .getPurchasedPhoneNumber(phoneNumber)) - .assertNext((PurchasedPhoneNumber number) -> { - assertEquals(phoneNumber, number.getPhoneNumber()); - assertEquals(COUNTRY_CODE, number.getCountryCode()); - }) - .verifyComplete(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getPurchasedPhoneNumberWithResponse(HttpClient httpClient) { - String phoneNumber = redactIfPlaybackMode(getTestPhoneNumber()); - StepVerifier.create( - this.getClientWithConnectionString(httpClient, "getPurchasedPhoneNumberWithResponse") - .getPurchasedPhoneNumberWithResponse(phoneNumber)) - .assertNext((Response response) -> { - assertEquals(200, response.getStatusCode()); - assertEquals(phoneNumber, response.getValue().getPhoneNumber()); - assertEquals(COUNTRY_CODE, response.getValue().getCountryCode()); - }) - .verifyComplete(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void listPurchasedPhoneNumbers(HttpClient httpClient) { - StepVerifier.create( - this.getClientWithConnectionString(httpClient, "listPurchasedPhoneNumbers") - .listPurchasedPhoneNumbers() - .next()) - .assertNext((PurchasedPhoneNumber number) -> { - assertNotNull(number.getPhoneNumber()); - assertEquals(COUNTRY_CODE, number.getCountryCode()); - }) - .verifyComplete(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable(named = "COMMUNICATION_SKIP_INT_PHONENUMBERS_TEST", matches = "(?i)(true)") - public void beginSearchAvailablePhoneNumbers(HttpClient httpClient) { - PhoneNumbersAsyncClient client = this.getClientWithConnectionString(httpClient, - "beginSearchAvailablePhoneNumbers"); - StepVerifier.create( - beginSearchAvailablePhoneNumbersHelper(client, true).last() - .flatMap((AsyncPollResponse result) -> { - return result.getFinalResult(); - })) - .assertNext((PhoneNumberSearchResult searchResult) -> { - assertEquals(searchResult.getPhoneNumbers().size(), 1); - assertNotNull(searchResult.getSearchId()); - }) - .verifyComplete(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable(named = "COMMUNICATION_SKIP_INT_PHONENUMBERS_TEST", matches = "(?i)(true)") - public void beginSearchAvailablePhoneNumbersWithoutOptions(HttpClient httpClient) { - PhoneNumbersAsyncClient client = this.getClientWithConnectionString(httpClient, - "getPurchasedPhoneNumberForCapabilities"); - StepVerifier.create( - beginSearchAvailablePhoneNumbersHelper(client, false).last() - .flatMap((AsyncPollResponse result) -> { - return result.getFinalResult(); - })) - .assertNext((PhoneNumberSearchResult searchResult) -> { - assertEquals(searchResult.getPhoneNumbers().size(), 1); - assertNotNull(searchResult.getSearchId()); - }) - .verifyComplete(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable(named = "SKIP_LIVE_TEST", matches = "(?i)(true)") - public void beginPurchaseandReleasePhoneNumbers(HttpClient httpClient) { - PhoneNumbersAsyncClient client = this.getClientWithConnectionString(httpClient, - "getPurchasedPhoneNumberForCapabilities"); - StepVerifier.create( - beginSearchAvailablePhoneNumbersHelper(client, true).last() - .flatMap((AsyncPollResponse result) -> { - return result.getFinalResult() - .flatMap((PhoneNumberSearchResult searchResult) -> { - String phoneNumber = searchResult - .getPhoneNumbers() - .get(0); - return beginPurchasePhoneNumbersHelper( - client, - searchResult.getSearchId()) - .last() - .flatMap(( - AsyncPollResponse purchaseResult) -> { - assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, - purchaseResult.getStatus()); - return beginReleasePhoneNumberHelper( - client, - phoneNumber) - .last(); - }); - }); - })) - .assertNext((AsyncPollResponse releaseResult) -> { - assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, - releaseResult.getStatus()); - - }) - .verifyComplete(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable(named = "COMMUNICATION_SKIP_INT_PHONENUMBERS_TEST", matches = "(?i)(true)") - @DisabledIfEnvironmentVariable(named = "SKIP_UPDATE_CAPABILITIES_LIVE_TESTS", matches = "(?i)(true)") - public void beginUpdatePhoneNumberCapabilities(HttpClient httpClient) { - String phoneNumber = getTestPhoneNumber(); - PhoneNumbersAsyncClient client = this.getClientWithConnectionString(httpClient, - "getPurchasedPhoneNumberForCapabilities"); - StepVerifier.create( - client.getPurchasedPhoneNumberWithResponse(phoneNumber) - .flatMap(responseAcquiredPhone -> { - PhoneNumberCapabilities capabilities = new PhoneNumberCapabilities(); - capabilities.setCalling(responseAcquiredPhone.getValue() - .getCapabilities() - .getCalling() == PhoneNumberCapabilityType.INBOUND - ? PhoneNumberCapabilityType.OUTBOUND - : PhoneNumberCapabilityType.INBOUND); - capabilities.setSms(responseAcquiredPhone.getValue() - .getCapabilities() - .getSms() == PhoneNumberCapabilityType.INBOUND_OUTBOUND - ? PhoneNumberCapabilityType.OUTBOUND - : PhoneNumberCapabilityType.INBOUND_OUTBOUND); - return beginUpdatePhoneNumberCapabilitiesHelper(client, - phoneNumber, capabilities) - .last() - .flatMap((AsyncPollResponse result) -> { - assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, - result.getStatus()); - assertEquals(PhoneNumberOperationStatus.SUCCEEDED, - result.getValue() - .getStatus()); - return result.getFinalResult(); - }); - })) - .assertNext(Assertions::assertNotNull) - .verifyComplete(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getPurchasedPhoneNumberNullNumber(HttpClient httpClient) { - StepVerifier.create( - this.getClientWithConnectionString(httpClient, "getPurchasedPhoneNumberNullNumber") - .getPurchasedPhoneNumber(null)) - .verifyError(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getPurchasedPhoneNumberWithResponseNullNumber(HttpClient httpClient) { - StepVerifier.create( - this.getClientWithConnectionString(httpClient, - "getPurchasedPhoneNumberWithResponseNullNumber") - .getPurchasedPhoneNumberWithResponse(null)) - .verifyError(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void beginSearchAvailablePhoneNumbersNullCountryCode(HttpClient httpClient) { - StepVerifier.create( - this.getClientWithConnectionString(httpClient, - "beginSearchAvailablePhoneNumbersNullCountryCode") - .beginSearchAvailablePhoneNumbers(null, PhoneNumberType.TOLL_FREE, - PhoneNumberAssignmentType.APPLICATION, null, null)) - .verifyError(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void beginUpdatePhoneNumberCapabilitiesNullPhoneNumber(HttpClient httpClient) { - StepVerifier.create( - this.getClientWithConnectionString(httpClient, - "beginUpdatePhoneNumberCapabilitiesNullPhoneNumber") - .beginUpdatePhoneNumberCapabilities(null, - new PhoneNumberCapabilities())) - .verifyError(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void beginUpdatePhoneNumberCapabilitiesUnauthorizedPhoneNumber(HttpClient httpClient) { - PhoneNumberCapabilities capabilities = new PhoneNumberCapabilities(); - capabilities.setCalling(PhoneNumberCapabilityType.INBOUND); - StepVerifier.create( - this.getClientWithConnectionString(httpClient, - "beginUpdatePhoneNumberCapabilitiesUnauthorizedPhoneNumber") - .beginUpdatePhoneNumberCapabilities("+14255555111", capabilities)) - .verifyError(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void beginUpdatePhoneNumberCapabilitiesInvalidPhoneNumber(HttpClient httpClient) { - PhoneNumberCapabilities capabilities = new PhoneNumberCapabilities(); - capabilities.setCalling(PhoneNumberCapabilityType.INBOUND); - StepVerifier.create( - this.getClientWithConnectionString(httpClient, - "beginUpdatePhoneNumberCapabilitiesInvalidPhoneNumber") - .beginUpdatePhoneNumberCapabilities("invalid-phone-number", - capabilities)) - .verifyError(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getTollFreeAreaCodesWithAAD(HttpClient httpClient) { - StepVerifier.create( - this.getClientWithManagedIdentity(httpClient, "listAvailableTollFreeAreaCodes") - .listAvailableTollFreeAreaCodes("US", - PhoneNumberAssignmentType.APPLICATION) - .next()) - .expectAccessibleContext(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getGeographicAreaCodesWithAAD(HttpClient httpClient) { - PhoneNumberLocality locality = this.getClientWithConnectionString(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", null).blockFirst(); - StepVerifier.create( - this.getClientWithManagedIdentity(httpClient, "listAvailableGeographicAreaCodes") - .listAvailableGeographicAreaCodes("US", - PhoneNumberAssignmentType.PERSON, - locality.getLocalizedName(), - locality.getAdministrativeDivision() - .getAbbreviatedName()) - .next()) - .assertNext((PhoneNumberAreaCode areaCodes) -> { - assertNotNull(areaCodes); - }) - .verifyComplete(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getCountriesWithAAD(HttpClient httpClient) { - StepVerifier.create( - this.getClientWithManagedIdentity(httpClient, "listAvailableCountries") - .listAvailableCountries().next()) - .assertNext((PhoneNumberCountry country) -> { - assertNotNull(country); - }) - .verifyComplete(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getLocalitiesWithAAD(HttpClient httpClient) { - StepVerifier.create( - this.getClientWithManagedIdentity(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", null).next()) - .assertNext((PhoneNumberLocality locality) -> { - assertNotNull(locality); - }) - .verifyComplete(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getLocalitiesAdministrativeDivisionWithAAD(HttpClient httpClient) { - PhoneNumberLocality locality = this.getClientWithConnectionString(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", null).blockFirst(); - StepVerifier.create( - this.getClientWithManagedIdentity(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", - locality.getAdministrativeDivision() - .getAbbreviatedName()) - .next()) - .assertNext((PhoneNumberLocality localityWithAD) -> { - assertNotNull(localityWithAD); - assertEquals(localityWithAD.getAdministrativeDivision().getAbbreviatedName(), - locality.getAdministrativeDivision().getAbbreviatedName()); - }) - .verifyComplete(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getOfferingsWithAAD(HttpClient httpClient) { - StepVerifier.create( - this.getClientWithManagedIdentity(httpClient, "listAvailableOfferings") - .listAvailableOfferings("US", null, null).next()) - .assertNext((PhoneNumberOffering offering) -> { - assertNotNull(offering); - }) - .verifyComplete(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getTollFreeAreaCodes(HttpClient httpClient) { - StepVerifier.create( - this.getClientWithConnectionString(httpClient, "listAvailableTollFreeAreaCodes") - .listAvailableTollFreeAreaCodes("US", - PhoneNumberAssignmentType.APPLICATION) - .next()) - .expectAccessibleContext(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getGeographicAreaCodes(HttpClient httpClient) { - PhoneNumberLocality locality = this.getClientWithConnectionString(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", null).blockFirst(); - StepVerifier.create( - this.getClientWithConnectionString(httpClient, "listAvailableGeographicAreaCodes") - .listAvailableGeographicAreaCodes("US", - PhoneNumberAssignmentType.PERSON, - locality.getLocalizedName(), - locality.getAdministrativeDivision() - .getAbbreviatedName()) - .next()) - .assertNext((PhoneNumberAreaCode areaCodes) -> { - assertNotNull(areaCodes); - }) - .verifyComplete(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getCountries(HttpClient httpClient) { - StepVerifier.create( - this.getClientWithConnectionString(httpClient, "listAvailableCountries") - .listAvailableCountries() - .next()) - .assertNext((PhoneNumberCountry country) -> { - assertNotNull(country); - }) - .verifyComplete(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getLocalities(HttpClient httpClient) { - StepVerifier.create( - this.getClientWithConnectionString(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", null).next()) - .assertNext((PhoneNumberLocality locality) -> { - assertNotNull(locality); - }) - .verifyComplete(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getLocalitiesAdministrativeDivision(HttpClient httpClient) { - String localityAdministraiveDivision = this - .getClientWithConnectionString(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", null).blockFirst().getAdministrativeDivision() - .getAbbreviatedName(); - StepVerifier.create( - this.getClientWithConnectionString(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", localityAdministraiveDivision).next()) - .assertNext((PhoneNumberLocality locality) -> { - assertNotNull(locality); - assertEquals(locality.getAdministrativeDivision().getAbbreviatedName(), - localityAdministraiveDivision); - }) - .verifyComplete(); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getOfferings(HttpClient httpClient) { - StepVerifier.create( - this.getClientWithConnectionString(httpClient, "listAvailableOfferings") - .listAvailableOfferings("US", null, null).next()) - .assertNext((PhoneNumberOffering offering) -> { - assertNotNull(offering); - }) - .verifyComplete(); - } - - private PollerFlux beginSearchAvailablePhoneNumbersHelper( - PhoneNumbersAsyncClient client, boolean withOptions) { - PhoneNumberCapabilities capabilities = new PhoneNumberCapabilities(); - capabilities.setCalling(PhoneNumberCapabilityType.INBOUND); - capabilities.setSms(PhoneNumberCapabilityType.INBOUND_OUTBOUND); - PhoneNumberSearchOptions searchOptions = new PhoneNumberSearchOptions().setQuantity(1); - - if (withOptions) { - return setPollInterval(client - .beginSearchAvailablePhoneNumbers( - COUNTRY_CODE, - PhoneNumberType.TOLL_FREE, - PhoneNumberAssignmentType.APPLICATION, - capabilities, - searchOptions)); - } - return setPollInterval(client - .beginSearchAvailablePhoneNumbers( - COUNTRY_CODE, - PhoneNumberType.TOLL_FREE, - PhoneNumberAssignmentType.APPLICATION, - capabilities)); - } - - private PollerFlux beginPurchasePhoneNumbersHelper( - PhoneNumbersAsyncClient client, String searchId) { - return setPollInterval(client - .beginPurchasePhoneNumbers(searchId)); - } - - private PollerFlux beginReleasePhoneNumberHelper( - PhoneNumbersAsyncClient client, String phoneNumber) { - return setPollInterval(client - .beginReleasePhoneNumber(phoneNumber)); - } - - private PollerFlux beginUpdatePhoneNumberCapabilitiesHelper( - PhoneNumbersAsyncClient client, String phoneNumber, PhoneNumberCapabilities capabilities) { - - return setPollInterval(client - .beginUpdatePhoneNumberCapabilities(phoneNumber, capabilities)); - } - - private PollerFlux setPollInterval(PollerFlux pollerFlux) { - return interceptorManager.isPlaybackMode() - ? pollerFlux.setPollInterval(Duration.ofMillis(1)) - : pollerFlux.setPollInterval(Duration.ofSeconds(1)); - } - - private PhoneNumbersAsyncClient getClientWithConnectionString(HttpClient httpClient, String testName) { - PhoneNumbersClientBuilder builder = super.getClientBuilderWithConnectionString(httpClient); - return addLoggingPolicy(builder, testName).buildAsyncClient(); - } - - private PhoneNumbersAsyncClient getClientWithManagedIdentity(HttpClient httpClient, String testName) { - PhoneNumbersClientBuilder builder = super.getClientBuilderUsingManagedIdentity(httpClient); - return addLoggingPolicy(builder, testName).buildAsyncClient(); - } + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getPurchasedPhoneNumber(HttpClient httpClient) { + String phoneNumber = redactIfPlaybackMode(getTestPhoneNumber()); + StepVerifier.create( + this.getClientWithConnectionString(httpClient, "getPurchasedPhoneNumber") + .getPurchasedPhoneNumber(phoneNumber)) + .assertNext((PurchasedPhoneNumber number) -> { + assertEquals(phoneNumber, number.getPhoneNumber()); + assertEquals(COUNTRY_CODE, number.getCountryCode()); + }) + .verifyComplete(); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getPurchasedPhoneNumberWithAAD(HttpClient httpClient) { + String phoneNumber = redactIfPlaybackMode(getTestPhoneNumber()); + StepVerifier.create( + this.getClientWithManagedIdentity(httpClient, "getPurchasedPhoneNumberWithAAD") + .getPurchasedPhoneNumber(phoneNumber)) + .assertNext((PurchasedPhoneNumber number) -> { + assertEquals(phoneNumber, number.getPhoneNumber()); + assertEquals(COUNTRY_CODE, number.getCountryCode()); + }) + .verifyComplete(); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getPurchasedPhoneNumberWithResponse(HttpClient httpClient) { + String phoneNumber = redactIfPlaybackMode(getTestPhoneNumber()); + StepVerifier.create( + this.getClientWithConnectionString(httpClient, "getPurchasedPhoneNumberWithResponse") + .getPurchasedPhoneNumberWithResponse(phoneNumber)) + .assertNext((Response response) -> { + assertEquals(200, response.getStatusCode()); + assertEquals(phoneNumber, response.getValue().getPhoneNumber()); + assertEquals(COUNTRY_CODE, response.getValue().getCountryCode()); + }) + .verifyComplete(); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void listPurchasedPhoneNumbers(HttpClient httpClient) { + StepVerifier.create( + this.getClientWithConnectionString(httpClient, "listPurchasedPhoneNumbers") + .listPurchasedPhoneNumbers() + .next()) + .assertNext((PurchasedPhoneNumber number) -> { + assertNotNull(number.getPhoneNumber()); + assertEquals(COUNTRY_CODE, number.getCountryCode()); + }) + .verifyComplete(); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable(named = "COMMUNICATION_SKIP_INT_PHONENUMBERS_TEST", matches = "(?i)(true)") + public void beginSearchAvailablePhoneNumbers(HttpClient httpClient) { + PhoneNumbersAsyncClient client = this.getClientWithConnectionString(httpClient, + "beginSearchAvailablePhoneNumbers"); + StepVerifier.create( + beginSearchAvailablePhoneNumbersHelper(client, true).last() + .flatMap((AsyncPollResponse result) -> { + return result.getFinalResult(); + })) + .assertNext((PhoneNumberSearchResult searchResult) -> { + assertEquals(searchResult.getPhoneNumbers().size(), 1); + assertNotNull(searchResult.getSearchId()); + }) + .verifyComplete(); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable(named = "COMMUNICATION_SKIP_INT_PHONENUMBERS_TEST", matches = "(?i)(true)") + public void beginSearchAvailablePhoneNumbersWithoutOptions(HttpClient httpClient) { + PhoneNumbersAsyncClient client = this.getClientWithConnectionString(httpClient, + "getPurchasedPhoneNumberForCapabilities"); + StepVerifier.create( + beginSearchAvailablePhoneNumbersHelper(client, false).last() + .flatMap((AsyncPollResponse result) -> { + return result.getFinalResult(); + })) + .assertNext((PhoneNumberSearchResult searchResult) -> { + assertEquals(searchResult.getPhoneNumbers().size(), 1); + assertNotNull(searchResult.getSearchId()); + }) + .verifyComplete(); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable(named = "SKIP_LIVE_TEST", matches = "(?i)(true)") + public void beginPurchaseandReleasePhoneNumbers(HttpClient httpClient) { + PhoneNumbersAsyncClient client = this.getClientWithConnectionString(httpClient, + "getPurchasedPhoneNumberForCapabilities"); + StepVerifier.create( + beginSearchAvailablePhoneNumbersHelper(client, true).last() + .flatMap((AsyncPollResponse result) -> { + return result.getFinalResult() + .flatMap((PhoneNumberSearchResult searchResult) -> { + String phoneNumber = searchResult + .getPhoneNumbers() + .get(0); + return beginPurchasePhoneNumbersHelper( + client, + searchResult.getSearchId()) + .last() + .flatMap(( + AsyncPollResponse purchaseResult) -> { + assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, + purchaseResult.getStatus()); + return beginReleasePhoneNumberHelper( + client, + phoneNumber) + .last(); + }); + }); + })) + .assertNext((AsyncPollResponse releaseResult) -> { + assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, + releaseResult.getStatus()); + + }) + .verifyComplete(); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable(named = "COMMUNICATION_SKIP_INT_PHONENUMBERS_TEST", matches = "(?i)(true)") + @DisabledIfEnvironmentVariable(named = "SKIP_UPDATE_CAPABILITIES_LIVE_TESTS", matches = "(?i)(true)") + public void beginUpdatePhoneNumberCapabilities(HttpClient httpClient) { + String phoneNumber = getTestPhoneNumber(); + PhoneNumbersAsyncClient client = this.getClientWithConnectionString(httpClient, + "getPurchasedPhoneNumberForCapabilities"); + StepVerifier.create( + client.getPurchasedPhoneNumberWithResponse(phoneNumber) + .flatMap(responseAcquiredPhone -> { + PhoneNumberCapabilities capabilities = new PhoneNumberCapabilities(); + capabilities.setCalling(responseAcquiredPhone.getValue() + .getCapabilities() + .getCalling() == PhoneNumberCapabilityType.INBOUND + ? PhoneNumberCapabilityType.OUTBOUND + : PhoneNumberCapabilityType.INBOUND); + capabilities.setSms(responseAcquiredPhone.getValue() + .getCapabilities() + .getSms() == PhoneNumberCapabilityType.INBOUND_OUTBOUND + ? PhoneNumberCapabilityType.OUTBOUND + : PhoneNumberCapabilityType.INBOUND_OUTBOUND); + return beginUpdatePhoneNumberCapabilitiesHelper(client, + phoneNumber, capabilities) + .last() + .flatMap((AsyncPollResponse result) -> { + assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, + result.getStatus()); + assertEquals(PhoneNumberOperationStatus.SUCCEEDED, + result.getValue() + .getStatus()); + return result.getFinalResult(); + }); + })) + .assertNext(Assertions::assertNotNull) + .verifyComplete(); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getPurchasedPhoneNumberNullNumber(HttpClient httpClient) { + StepVerifier.create( + this.getClientWithConnectionString(httpClient, "getPurchasedPhoneNumberNullNumber") + .getPurchasedPhoneNumber(null)) + .verifyError(); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getPurchasedPhoneNumberWithResponseNullNumber(HttpClient httpClient) { + StepVerifier.create( + this.getClientWithConnectionString(httpClient, + "getPurchasedPhoneNumberWithResponseNullNumber") + .getPurchasedPhoneNumberWithResponse(null)) + .verifyError(); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void beginSearchAvailablePhoneNumbersNullCountryCode(HttpClient httpClient) { + StepVerifier.create( + this.getClientWithConnectionString(httpClient, + "beginSearchAvailablePhoneNumbersNullCountryCode") + .beginSearchAvailablePhoneNumbers(null, PhoneNumberType.TOLL_FREE, + PhoneNumberAssignmentType.APPLICATION, null, null)) + .verifyError(); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void beginUpdatePhoneNumberCapabilitiesNullPhoneNumber(HttpClient httpClient) { + StepVerifier.create( + this.getClientWithConnectionString(httpClient, + "beginUpdatePhoneNumberCapabilitiesNullPhoneNumber") + .beginUpdatePhoneNumberCapabilities(null, + new PhoneNumberCapabilities())) + .verifyError(); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void beginUpdatePhoneNumberCapabilitiesUnauthorizedPhoneNumber(HttpClient httpClient) { + PhoneNumberCapabilities capabilities = new PhoneNumberCapabilities(); + capabilities.setCalling(PhoneNumberCapabilityType.INBOUND); + StepVerifier.create( + this.getClientWithConnectionString(httpClient, + "beginUpdatePhoneNumberCapabilitiesUnauthorizedPhoneNumber") + .beginUpdatePhoneNumberCapabilities("+14255555111", capabilities)) + .verifyError(); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void beginUpdatePhoneNumberCapabilitiesInvalidPhoneNumber(HttpClient httpClient) { + PhoneNumberCapabilities capabilities = new PhoneNumberCapabilities(); + capabilities.setCalling(PhoneNumberCapabilityType.INBOUND); + StepVerifier.create( + this.getClientWithConnectionString(httpClient, + "beginUpdatePhoneNumberCapabilitiesInvalidPhoneNumber") + .beginUpdatePhoneNumberCapabilities("invalid-phone-number", + capabilities)) + .verifyError(); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getTollFreeAreaCodesWithAAD(HttpClient httpClient) { + StepVerifier.create( + this.getClientWithManagedIdentity(httpClient, "listAvailableTollFreeAreaCodes") + .listAvailableTollFreeAreaCodes("US", + PhoneNumberAssignmentType.APPLICATION) + .next()) + .expectAccessibleContext(); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getGeographicAreaCodesWithAAD(HttpClient httpClient) { + PhoneNumberLocality locality = this.getClientWithConnectionString(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", null).blockFirst(); + StepVerifier.create( + this.getClientWithManagedIdentity(httpClient, "listAvailableGeographicAreaCodes") + .listAvailableGeographicAreaCodes("US", + PhoneNumberAssignmentType.PERSON, + locality.getLocalizedName(), + locality.getAdministrativeDivision() + .getAbbreviatedName()) + .next()) + .assertNext((PhoneNumberAreaCode areaCodes) -> { + assertNotNull(areaCodes); + }) + .verifyComplete(); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getCountriesWithAAD(HttpClient httpClient) { + StepVerifier.create( + this.getClientWithManagedIdentity(httpClient, "listAvailableCountries") + .listAvailableCountries().next()) + .assertNext((PhoneNumberCountry country) -> { + assertNotNull(country); + }) + .verifyComplete(); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getLocalitiesWithAAD(HttpClient httpClient) { + StepVerifier.create( + this.getClientWithManagedIdentity(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", null).next()) + .assertNext((PhoneNumberLocality locality) -> { + assertNotNull(locality); + }) + .verifyComplete(); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getLocalitiesAdministrativeDivisionWithAAD(HttpClient httpClient) { + PhoneNumberLocality locality = this.getClientWithConnectionString(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", null).blockFirst(); + StepVerifier.create( + this.getClientWithManagedIdentity(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", + locality.getAdministrativeDivision() + .getAbbreviatedName()) + .next()) + .assertNext((PhoneNumberLocality localityWithAD) -> { + assertNotNull(localityWithAD); + assertEquals(localityWithAD.getAdministrativeDivision().getAbbreviatedName(), + locality.getAdministrativeDivision().getAbbreviatedName()); + }) + .verifyComplete(); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getOfferingsWithAAD(HttpClient httpClient) { + StepVerifier.create( + this.getClientWithManagedIdentity(httpClient, "listAvailableOfferings") + .listAvailableOfferings("US", null, null).next()) + .assertNext((PhoneNumberOffering offering) -> { + assertNotNull(offering); + }) + .verifyComplete(); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getTollFreeAreaCodes(HttpClient httpClient) { + StepVerifier.create( + this.getClientWithConnectionString(httpClient, "listAvailableTollFreeAreaCodes") + .listAvailableTollFreeAreaCodes("US", + PhoneNumberAssignmentType.APPLICATION) + .next()) + .expectAccessibleContext(); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getGeographicAreaCodes(HttpClient httpClient) { + PhoneNumberLocality locality = this.getClientWithConnectionString(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", null).blockFirst(); + StepVerifier.create( + this.getClientWithConnectionString(httpClient, "listAvailableGeographicAreaCodes") + .listAvailableGeographicAreaCodes("US", + PhoneNumberAssignmentType.PERSON, + locality.getLocalizedName(), + locality.getAdministrativeDivision() + .getAbbreviatedName()) + .next()) + .assertNext((PhoneNumberAreaCode areaCodes) -> { + assertNotNull(areaCodes); + }) + .verifyComplete(); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getCountries(HttpClient httpClient) { + StepVerifier.create( + this.getClientWithConnectionString(httpClient, "listAvailableCountries") + .listAvailableCountries() + .next()) + .assertNext((PhoneNumberCountry country) -> { + assertNotNull(country); + }) + .verifyComplete(); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getLocalities(HttpClient httpClient) { + StepVerifier.create( + this.getClientWithConnectionString(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", null).next()) + .assertNext((PhoneNumberLocality locality) -> { + assertNotNull(locality); + }) + .verifyComplete(); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getLocalitiesAdministrativeDivision(HttpClient httpClient) { + String localityAdministraiveDivision = this + .getClientWithConnectionString(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", null).blockFirst().getAdministrativeDivision() + .getAbbreviatedName(); + StepVerifier.create( + this.getClientWithConnectionString(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", localityAdministraiveDivision).next()) + .assertNext((PhoneNumberLocality locality) -> { + assertNotNull(locality); + assertEquals(locality.getAdministrativeDivision().getAbbreviatedName(), + localityAdministraiveDivision); + }) + .verifyComplete(); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getOfferings(HttpClient httpClient) { + StepVerifier.create( + this.getClientWithConnectionString(httpClient, "listAvailableOfferings") + .listAvailableOfferings("US", null, null).next()) + .assertNext((PhoneNumberOffering offering) -> { + assertNotNull(offering); + }) + .verifyComplete(); + } + + private PollerFlux beginSearchAvailablePhoneNumbersHelper( + PhoneNumbersAsyncClient client, boolean withOptions) { + PhoneNumberCapabilities capabilities = new PhoneNumberCapabilities(); + capabilities.setCalling(PhoneNumberCapabilityType.INBOUND); + capabilities.setSms(PhoneNumberCapabilityType.INBOUND_OUTBOUND); + PhoneNumberSearchOptions searchOptions = new PhoneNumberSearchOptions().setQuantity(1); + + if (withOptions) { + return setPollInterval(client + .beginSearchAvailablePhoneNumbers( + COUNTRY_CODE, + PhoneNumberType.TOLL_FREE, + PhoneNumberAssignmentType.APPLICATION, + capabilities, + searchOptions)); + } + return setPollInterval(client + .beginSearchAvailablePhoneNumbers( + COUNTRY_CODE, + PhoneNumberType.TOLL_FREE, + PhoneNumberAssignmentType.APPLICATION, + capabilities)); + } + + private PollerFlux beginPurchasePhoneNumbersHelper( + PhoneNumbersAsyncClient client, String searchId) { + return setPollInterval(client + .beginPurchasePhoneNumbers(searchId)); + } + + private PollerFlux beginReleasePhoneNumberHelper( + PhoneNumbersAsyncClient client, String phoneNumber) { + return setPollInterval(client + .beginReleasePhoneNumber(phoneNumber)); + } + + private PollerFlux beginUpdatePhoneNumberCapabilitiesHelper( + PhoneNumbersAsyncClient client, String phoneNumber, PhoneNumberCapabilities capabilities) { + + return setPollInterval(client + .beginUpdatePhoneNumberCapabilities(phoneNumber, capabilities)); + } + + private PollerFlux setPollInterval(PollerFlux pollerFlux) { + return interceptorManager.isPlaybackMode() + ? pollerFlux.setPollInterval(Duration.ofMillis(1)) + : pollerFlux.setPollInterval(Duration.ofSeconds(1)); + } + + private PhoneNumbersAsyncClient getClientWithConnectionString(HttpClient httpClient, String testName) { + PhoneNumbersClientBuilder builder = super.getClientBuilderWithConnectionString(httpClient); + return addLoggingPolicy(builder, testName).buildAsyncClient(); + } + + private PhoneNumbersAsyncClient getClientWithManagedIdentity(HttpClient httpClient, String testName) { + PhoneNumbersClientBuilder builder = super.getClientBuilderUsingManagedIdentity(httpClient); + return addLoggingPolicy(builder, testName).buildAsyncClient(); + } } diff --git a/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersClientIntegrationTest.java b/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersClientIntegrationTest.java index ecdd36bc0616..c3c0863ce838 100644 --- a/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersClientIntegrationTest.java +++ b/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersClientIntegrationTest.java @@ -39,390 +39,390 @@ public class PhoneNumbersClientIntegrationTest extends PhoneNumbersIntegrationTestBase { - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getPurchasedPhoneNumber(HttpClient httpClient) { - String phoneNumber = redactIfPlaybackMode(getTestPhoneNumber()); - PurchasedPhoneNumber number = this - .getClientWithConnectionString(httpClient, "getPurchasedPhoneNumberSync") - .getPurchasedPhoneNumber(phoneNumber); - assertEquals(phoneNumber, number.getPhoneNumber()); - assertEquals(COUNTRY_CODE, number.getCountryCode()); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getPurchasedPhoneNumberWithAAD(HttpClient httpClient) { - String phoneNumber = redactIfPlaybackMode(getTestPhoneNumber()); - PurchasedPhoneNumber number = this - .getClientWithManagedIdentity(httpClient, "getPurchasedPhoneNumberWithAADSync") - .getPurchasedPhoneNumber(phoneNumber); - assertEquals(phoneNumber, number.getPhoneNumber()); - assertEquals(COUNTRY_CODE, number.getCountryCode()); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getPurchasedPhoneNumberWithResponse(HttpClient httpClient) { - String phoneNumber = redactIfPlaybackMode(getTestPhoneNumber()); - Response response = this - .getClientWithConnectionString(httpClient, "getPurchasedPhoneNumberWithResponseSync") - .getPurchasedPhoneNumberWithResponse(phoneNumber, Context.NONE); - PurchasedPhoneNumber number = response.getValue(); - assertEquals(200, response.getStatusCode()); - assertEquals(phoneNumber, number.getPhoneNumber()); - assertEquals(COUNTRY_CODE, number.getCountryCode()); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void listPurchasedPhoneNumbers(HttpClient httpClient) { - PagedIterable numbers = this - .getClientWithConnectionString(httpClient, "listPurchasedPhoneNumbersSync") - .listPurchasedPhoneNumbers(Context.NONE); - PurchasedPhoneNumber number = numbers.iterator().next(); - assertNotNull(number.getPhoneNumber()); - assertEquals(COUNTRY_CODE, number.getCountryCode()); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void listPurchasedPhoneNumbersWithoutContext(HttpClient httpClient) { - PagedIterable numbers = this - .getClientWithConnectionString(httpClient, "listPurchasedPhoneNumbersSync") - .listPurchasedPhoneNumbers(); - PurchasedPhoneNumber number = numbers.iterator().next(); - assertNotNull(number.getPhoneNumber()); - assertEquals(COUNTRY_CODE, number.getCountryCode()); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable(named = "COMMUNICATION_SKIP_INT_PHONENUMBERS_TEST", matches = "(?i)(true)") - public void beginSearchAvailablePhoneNumbers(HttpClient httpClient) { - SyncPoller poller = beginSearchAvailablePhoneNumbersHelper( - httpClient, "beginSearchAvailablePhoneNumbersSync", true); - PollResponse response = poller.waitForCompletion(); - if (LongRunningOperationStatus.SUCCESSFULLY_COMPLETED == response.getStatus()) { - PhoneNumberSearchResult searchResult = poller.getFinalResult(); - assertEquals(searchResult.getPhoneNumbers().size(), 1); - assertNotNull(searchResult.getSearchId()); - } else { - fail("Long Running Operation Status was not successfully completed"); - } - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable(named = "SKIP_LIVE_TEST", matches = "(?i)(true)") - public void beginPurchaseandReleasePhoneNumbersWithoutContext(HttpClient httpClient) { - SyncPoller poller = beginSearchAvailablePhoneNumbersHelper( - httpClient, - "beginPurchaseandReleasePhoneNumbers_beginSearchAvailablePhoneNumbersWithoutContextSync", - false); - PollResponse response = poller.waitForCompletion(); - if (LongRunningOperationStatus.SUCCESSFULLY_COMPLETED == response.getStatus()) { - PhoneNumberSearchResult searchResult = poller.getFinalResult(); - String phoneNumber = searchResult.getPhoneNumbers().get(0); - PollResponse purchaseOperationResponse = beginPurchasePhoneNumbersHelper( - httpClient, - searchResult.getSearchId(), "beginPurchasePhoneNumbersWithoutContextSync", - false) - .waitForCompletion(); - assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, - purchaseOperationResponse.getStatus()); - PollResponse releaseOperationResponse = beginReleasePhoneNumberHelper( - httpClient, - phoneNumber, "beginReleasePhoneNumberWithoutContextSync", false) - .waitForCompletion(); - assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, - releaseOperationResponse.getStatus()); - } else { - fail("Long Running Operation Status was not successfully completed"); - } - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable(named = "SKIP_LIVE_TEST", matches = "(?i)(true)") - public void beginPurchaseandReleasePhoneNumbers(HttpClient httpClient) { - SyncPoller poller = beginSearchAvailablePhoneNumbersHelper( - httpClient, "beginPurchaseandReleasePhoneNumbers_beginSearchAvailablePhoneNumbersSync", - true); - PollResponse response = poller.waitForCompletion(); - if (LongRunningOperationStatus.SUCCESSFULLY_COMPLETED == response.getStatus()) { - PhoneNumberSearchResult searchResult = poller.getFinalResult(); - String phoneNumber = searchResult.getPhoneNumbers().get(0); - PollResponse purchaseOperationResponse = beginPurchasePhoneNumbersHelper( - httpClient, - searchResult.getSearchId(), "beginPurchasePhoneNumbersSync", true) - .waitForCompletion(); - assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, - purchaseOperationResponse.getStatus()); - PollResponse releaseOperationResponse = beginReleasePhoneNumberHelper( - httpClient, - phoneNumber, "beginReleasePhoneNumberSync", true).waitForCompletion(); - assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, - releaseOperationResponse.getStatus()); - } else { - fail("Long Running Operation Status was not successfully completed"); - } - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable(named = "COMMUNICATION_SKIP_INT_PHONENUMBERS_TEST", matches = "(?i)(true)") - public void beginUpdatePhoneNumberCapabilitiesWithoutContext(HttpClient httpClient) { - String phoneNumber = getTestPhoneNumber(); - PollResponse result = beginUpdatePhoneNumberCapabilitiesHelper(httpClient, - phoneNumber, - "beginUpdatePhoneNumberCapabilitiesWithoutContextSync", false).waitForCompletion(); - assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, result.getStatus()); - assertEquals(PhoneNumberOperationStatus.SUCCEEDED, result.getValue().getStatus()); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable(named = "COMMUNICATION_SKIP_INT_PHONENUMBERS_TEST", matches = "(?i)(true)") - @DisabledIfEnvironmentVariable(named = "SKIP_UPDATE_CAPABILITIES_LIVE_TESTS", matches = "(?i)(true)") - public void beginUpdatePhoneNumberCapabilities(HttpClient httpClient) { - String phoneNumber = getTestPhoneNumber(); - PollResponse result = beginUpdatePhoneNumberCapabilitiesHelper(httpClient, - phoneNumber, - "beginUpdatePhoneNumberCapabilities", true).waitForCompletion(); - assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, result.getStatus()); - assertEquals(PhoneNumberOperationStatus.SUCCEEDED, result.getValue().getStatus()); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getTollFreeAreaCodes(HttpClient httpClient) { - PagedIterable areaCodesResult = this - .getClientWithConnectionString(httpClient, "listAvailableTollFreeAreaCodes") - .listAvailableTollFreeAreaCodes("US"); - String[] expectedAreaCodes = { "888", "877", "866", "855", "844", "800", "833", "88" }; - for (PhoneNumberAreaCode areaCode : areaCodesResult) { - assertTrue(Arrays.asList(expectedAreaCodes).contains(areaCode)); - } - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getGeographicAreaCodes(HttpClient httpClient) { - PhoneNumberLocality locality = this.getClientWithConnectionString(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", null).iterator().next(); - PagedIterable areaCodesResult = this - .getClientWithConnectionString(httpClient, "listAvailableGeographicAreaCodes") - .listAvailableGeographicAreaCodes("US", PhoneNumberAssignmentType.PERSON, - locality.getLocalizedName(), - locality.getAdministrativeDivision().getAbbreviatedName()); - PhoneNumberAreaCode areaCodes = areaCodesResult.iterator().next(); - assertNotNull(areaCodes); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getCountries(HttpClient httpClient) { - PagedIterable countriesResult = this - .getClientWithConnectionString(httpClient, "listAvailableCountries") - .listAvailableCountries(); - PhoneNumberCountry country = countriesResult.iterator().next(); - assertNotNull(country); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getLocalities(HttpClient httpClient) { - PagedIterable localitiesResult = this - .getClientWithConnectionString(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", null); - PhoneNumberLocality locality = localitiesResult.iterator().next(); - assertNotNull(locality); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getLocalitiesWithAdministrativeDivision(HttpClient httpClient) { - String localityAdministraiveDivision = this - .getClientWithConnectionString(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", null).iterator().next().getAdministrativeDivision() - .getAbbreviatedName(); - PagedIterable localitiesResult = this - .getClientWithConnectionString(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", localityAdministraiveDivision); - PhoneNumberLocality locality = localitiesResult.iterator().next(); - assertNotNull(locality); - assertEquals(locality.getAdministrativeDivision().getAbbreviatedName(), localityAdministraiveDivision); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getOfferings(HttpClient httpClient) { - PagedIterable offeringsResult = this - .getClientWithConnectionString(httpClient, "listAvailableOfferings") - .listAvailableOfferings("US", null, null); - PhoneNumberOffering offering = offeringsResult.iterator().next(); - assertNotNull(offering); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getTollFreeAreaCodesWithAAD(HttpClient httpClient) { - PagedIterable areaCodesResult = this - .getClientWithManagedIdentity(httpClient, "listAvailableTollFreeAreaCodes") - .listAvailableTollFreeAreaCodes("US"); - String[] expectedAreaCodes = { "888", "877", "866", "855", "844", "800", "833", "88" }; - for (PhoneNumberAreaCode areaCode : areaCodesResult) { - assertTrue(Arrays.asList(expectedAreaCodes).contains(areaCode)); - } - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getGeographicAreaCodesWithAAD(HttpClient httpClient) { - PhoneNumberLocality locality = this.getClientWithConnectionString(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", null).iterator().next(); - PagedIterable areaCodesResult = this - .getClientWithManagedIdentity(httpClient, "listAvailableGeographicAreaCodes") - .listAvailableGeographicAreaCodes("US", PhoneNumberAssignmentType.PERSON, - locality.getLocalizedName(), - locality.getAdministrativeDivision().getAbbreviatedName()); - PhoneNumberAreaCode areaCodes = areaCodesResult.iterator().next(); - assertNotNull(areaCodes); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getCountriesWithAAD(HttpClient httpClient) { - PagedIterable countriesResult = this - .getClientWithManagedIdentity(httpClient, "listAvailableCountries") - .listAvailableCountries(); - PhoneNumberCountry country = countriesResult.iterator().next(); - assertNotNull(country); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getLocalitiesWithAAD(HttpClient httpClient) { - PagedIterable localitiesResult = this - .getClientWithManagedIdentity(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", null); - PhoneNumberLocality locality = localitiesResult.iterator().next(); - assertNotNull(locality); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getLocalitiesWithAdministrativeDivisionWithAAD(HttpClient httpClient) { - PagedIterable localities = this - .getClientWithManagedIdentity(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", null); - PhoneNumberLocality localityWithAD = localities.iterator().next(); - - PagedIterable localitiesResult = this - .getClientWithManagedIdentity(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", - localityWithAD.getAdministrativeDivision().getAbbreviatedName()); - PhoneNumberLocality locality = localitiesResult.iterator().next(); - assertNotNull(locality); - assertEquals(locality.getAdministrativeDivision().getAbbreviatedName(), - localityWithAD.getAdministrativeDivision().getAbbreviatedName()); - } - - @ParameterizedTest - @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void getOfferingsWithAAD(HttpClient httpClient) { - PagedIterable offeringsResult = this - .getClientWithManagedIdentity(httpClient, "listAvailableOfferings") - .listAvailableOfferings("US", null, null); - PhoneNumberOffering offering = offeringsResult.iterator().next(); - assertNotNull(offering); - } - - private SyncPoller beginSearchAvailablePhoneNumbersHelper( - HttpClient httpClient, String testName, boolean withContext) { - PhoneNumberCapabilities capabilities = new PhoneNumberCapabilities(); - capabilities.setCalling(PhoneNumberCapabilityType.INBOUND); - capabilities.setSms(PhoneNumberCapabilityType.INBOUND_OUTBOUND); - PhoneNumberSearchOptions searchOptions = new PhoneNumberSearchOptions().setQuantity(1); - - if (withContext) { - return setPollInterval(getClientWithConnectionString(httpClient, testName) - .beginSearchAvailablePhoneNumbers( - COUNTRY_CODE, - PhoneNumberType.TOLL_FREE, - PhoneNumberAssignmentType.APPLICATION, - capabilities, - searchOptions, - Context.NONE)); - } - return setPollInterval( - getClientWithConnectionString(httpClient, testName).beginSearchAvailablePhoneNumbers( - COUNTRY_CODE, - PhoneNumberType.TOLL_FREE, - PhoneNumberAssignmentType.APPLICATION, - capabilities)); - } - - private SyncPoller beginPurchasePhoneNumbersHelper( - HttpClient httpClient, String searchId, String testName, boolean withContext) { - if (withContext) { - return setPollInterval(this.getClientWithConnectionString(httpClient, testName) - .beginPurchasePhoneNumbers(searchId, Context.NONE)); - } - return setPollInterval(this.getClientWithConnectionString(httpClient, testName) - .beginPurchasePhoneNumbers(searchId)); - } - - private SyncPoller beginReleasePhoneNumberHelper( - HttpClient httpClient, String phoneNumber, String testName, boolean withContext) { - if (getTestMode() == TestMode.PLAYBACK) { - phoneNumber = "+REDACTED"; - } - if (withContext) { - return setPollInterval(this.getClientWithConnectionString(httpClient, testName) - .beginReleasePhoneNumber(phoneNumber, Context.NONE)); - } - return setPollInterval(this.getClientWithConnectionString(httpClient, testName) - .beginReleasePhoneNumber(phoneNumber)); - } - - private SyncPoller beginUpdatePhoneNumberCapabilitiesHelper( - HttpClient httpClient, String phoneNumber, String testName, boolean withContext) { - PhoneNumbersClient client = this.getClientWithConnectionString(httpClient, testName); - Response responseAcquiredPhone = client.getPurchasedPhoneNumberWithResponse( - phoneNumber, - Context.NONE); - PhoneNumberCapabilities capabilities = new PhoneNumberCapabilities(); - capabilities.setCalling( - responseAcquiredPhone.getValue().getCapabilities() - .getCalling() == PhoneNumberCapabilityType.INBOUND - ? PhoneNumberCapabilityType.OUTBOUND - : PhoneNumberCapabilityType.INBOUND); - capabilities.setSms(responseAcquiredPhone.getValue().getCapabilities() - .getSms() == PhoneNumberCapabilityType.INBOUND_OUTBOUND - ? PhoneNumberCapabilityType.OUTBOUND - : PhoneNumberCapabilityType.INBOUND_OUTBOUND); - if (withContext) { - return setPollInterval(client.beginUpdatePhoneNumberCapabilities(phoneNumber, capabilities, - Context.NONE)); - } - return setPollInterval(client.beginUpdatePhoneNumberCapabilities(phoneNumber, capabilities)); - } - - private SyncPoller setPollInterval(SyncPoller syncPoller) { - return interceptorManager.isPlaybackMode() - ? syncPoller.setPollInterval(Duration.ofMillis(1)) - : syncPoller.setPollInterval(Duration.ofSeconds(1)); - } - - private PhoneNumbersClient getClientWithConnectionString(HttpClient httpClient, String testName) { - PhoneNumbersClientBuilder builder = super.getClientBuilderWithConnectionString(httpClient); - return addLoggingPolicy(builder, testName).buildClient(); - } - - private PhoneNumbersClient getClientWithManagedIdentity(HttpClient httpClient, String testName) { - PhoneNumbersClientBuilder builder = super.getClientBuilderUsingManagedIdentity(httpClient); - return addLoggingPolicy(builder, testName).buildClient(); - } + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getPurchasedPhoneNumber(HttpClient httpClient) { + String phoneNumber = redactIfPlaybackMode(getTestPhoneNumber()); + PurchasedPhoneNumber number = this + .getClientWithConnectionString(httpClient, "getPurchasedPhoneNumberSync") + .getPurchasedPhoneNumber(phoneNumber); + assertEquals(phoneNumber, number.getPhoneNumber()); + assertEquals(COUNTRY_CODE, number.getCountryCode()); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getPurchasedPhoneNumberWithAAD(HttpClient httpClient) { + String phoneNumber = redactIfPlaybackMode(getTestPhoneNumber()); + PurchasedPhoneNumber number = this + .getClientWithManagedIdentity(httpClient, "getPurchasedPhoneNumberWithAADSync") + .getPurchasedPhoneNumber(phoneNumber); + assertEquals(phoneNumber, number.getPhoneNumber()); + assertEquals(COUNTRY_CODE, number.getCountryCode()); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getPurchasedPhoneNumberWithResponse(HttpClient httpClient) { + String phoneNumber = redactIfPlaybackMode(getTestPhoneNumber()); + Response response = this + .getClientWithConnectionString(httpClient, "getPurchasedPhoneNumberWithResponseSync") + .getPurchasedPhoneNumberWithResponse(phoneNumber, Context.NONE); + PurchasedPhoneNumber number = response.getValue(); + assertEquals(200, response.getStatusCode()); + assertEquals(phoneNumber, number.getPhoneNumber()); + assertEquals(COUNTRY_CODE, number.getCountryCode()); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void listPurchasedPhoneNumbers(HttpClient httpClient) { + PagedIterable numbers = this + .getClientWithConnectionString(httpClient, "listPurchasedPhoneNumbersSync") + .listPurchasedPhoneNumbers(Context.NONE); + PurchasedPhoneNumber number = numbers.iterator().next(); + assertNotNull(number.getPhoneNumber()); + assertEquals(COUNTRY_CODE, number.getCountryCode()); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void listPurchasedPhoneNumbersWithoutContext(HttpClient httpClient) { + PagedIterable numbers = this + .getClientWithConnectionString(httpClient, "listPurchasedPhoneNumbersSync") + .listPurchasedPhoneNumbers(); + PurchasedPhoneNumber number = numbers.iterator().next(); + assertNotNull(number.getPhoneNumber()); + assertEquals(COUNTRY_CODE, number.getCountryCode()); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable(named = "COMMUNICATION_SKIP_INT_PHONENUMBERS_TEST", matches = "(?i)(true)") + public void beginSearchAvailablePhoneNumbers(HttpClient httpClient) { + SyncPoller poller = beginSearchAvailablePhoneNumbersHelper( + httpClient, "beginSearchAvailablePhoneNumbersSync", true); + PollResponse response = poller.waitForCompletion(); + if (LongRunningOperationStatus.SUCCESSFULLY_COMPLETED == response.getStatus()) { + PhoneNumberSearchResult searchResult = poller.getFinalResult(); + assertEquals(searchResult.getPhoneNumbers().size(), 1); + assertNotNull(searchResult.getSearchId()); + } else { + fail("Long Running Operation Status was not successfully completed"); + } + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable(named = "SKIP_LIVE_TEST", matches = "(?i)(true)") + public void beginPurchaseandReleasePhoneNumbersWithoutContext(HttpClient httpClient) { + SyncPoller poller = beginSearchAvailablePhoneNumbersHelper( + httpClient, + "beginPurchaseandReleasePhoneNumbers_beginSearchAvailablePhoneNumbersWithoutContextSync", + false); + PollResponse response = poller.waitForCompletion(); + if (LongRunningOperationStatus.SUCCESSFULLY_COMPLETED == response.getStatus()) { + PhoneNumberSearchResult searchResult = poller.getFinalResult(); + String phoneNumber = searchResult.getPhoneNumbers().get(0); + PollResponse purchaseOperationResponse = beginPurchasePhoneNumbersHelper( + httpClient, + searchResult.getSearchId(), "beginPurchasePhoneNumbersWithoutContextSync", + false) + .waitForCompletion(); + assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, + purchaseOperationResponse.getStatus()); + PollResponse releaseOperationResponse = beginReleasePhoneNumberHelper( + httpClient, + phoneNumber, "beginReleasePhoneNumberWithoutContextSync", false) + .waitForCompletion(); + assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, + releaseOperationResponse.getStatus()); + } else { + fail("Long Running Operation Status was not successfully completed"); + } + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable(named = "SKIP_LIVE_TEST", matches = "(?i)(true)") + public void beginPurchaseandReleasePhoneNumbers(HttpClient httpClient) { + SyncPoller poller = beginSearchAvailablePhoneNumbersHelper( + httpClient, "beginPurchaseandReleasePhoneNumbers_beginSearchAvailablePhoneNumbersSync", + true); + PollResponse response = poller.waitForCompletion(); + if (LongRunningOperationStatus.SUCCESSFULLY_COMPLETED == response.getStatus()) { + PhoneNumberSearchResult searchResult = poller.getFinalResult(); + String phoneNumber = searchResult.getPhoneNumbers().get(0); + PollResponse purchaseOperationResponse = beginPurchasePhoneNumbersHelper( + httpClient, + searchResult.getSearchId(), "beginPurchasePhoneNumbersSync", true) + .waitForCompletion(); + assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, + purchaseOperationResponse.getStatus()); + PollResponse releaseOperationResponse = beginReleasePhoneNumberHelper( + httpClient, + phoneNumber, "beginReleasePhoneNumberSync", true).waitForCompletion(); + assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, + releaseOperationResponse.getStatus()); + } else { + fail("Long Running Operation Status was not successfully completed"); + } + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable(named = "COMMUNICATION_SKIP_INT_PHONENUMBERS_TEST", matches = "(?i)(true)") + public void beginUpdatePhoneNumberCapabilitiesWithoutContext(HttpClient httpClient) { + String phoneNumber = getTestPhoneNumber(); + PollResponse result = beginUpdatePhoneNumberCapabilitiesHelper(httpClient, + phoneNumber, + "beginUpdatePhoneNumberCapabilitiesWithoutContextSync", false).waitForCompletion(); + assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, result.getStatus()); + assertEquals(PhoneNumberOperationStatus.SUCCEEDED, result.getValue().getStatus()); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable(named = "COMMUNICATION_SKIP_INT_PHONENUMBERS_TEST", matches = "(?i)(true)") + @DisabledIfEnvironmentVariable(named = "SKIP_UPDATE_CAPABILITIES_LIVE_TESTS", matches = "(?i)(true)") + public void beginUpdatePhoneNumberCapabilities(HttpClient httpClient) { + String phoneNumber = getTestPhoneNumber(); + PollResponse result = beginUpdatePhoneNumberCapabilitiesHelper(httpClient, + phoneNumber, + "beginUpdatePhoneNumberCapabilities", true).waitForCompletion(); + assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, result.getStatus()); + assertEquals(PhoneNumberOperationStatus.SUCCEEDED, result.getValue().getStatus()); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getTollFreeAreaCodes(HttpClient httpClient) { + PagedIterable areaCodesResult = this + .getClientWithConnectionString(httpClient, "listAvailableTollFreeAreaCodes") + .listAvailableTollFreeAreaCodes("US"); + String[] expectedAreaCodes = { "888", "877", "866", "855", "844", "800", "833", "88" }; + for (PhoneNumberAreaCode areaCode : areaCodesResult) { + assertTrue(Arrays.asList(expectedAreaCodes).contains(areaCode)); + } + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getGeographicAreaCodes(HttpClient httpClient) { + PhoneNumberLocality locality = this.getClientWithConnectionString(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", null).iterator().next(); + PagedIterable areaCodesResult = this + .getClientWithConnectionString(httpClient, "listAvailableGeographicAreaCodes") + .listAvailableGeographicAreaCodes("US", PhoneNumberAssignmentType.PERSON, + locality.getLocalizedName(), + locality.getAdministrativeDivision().getAbbreviatedName()); + PhoneNumberAreaCode areaCodes = areaCodesResult.iterator().next(); + assertNotNull(areaCodes); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getCountries(HttpClient httpClient) { + PagedIterable countriesResult = this + .getClientWithConnectionString(httpClient, "listAvailableCountries") + .listAvailableCountries(); + PhoneNumberCountry country = countriesResult.iterator().next(); + assertNotNull(country); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getLocalities(HttpClient httpClient) { + PagedIterable localitiesResult = this + .getClientWithConnectionString(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", null); + PhoneNumberLocality locality = localitiesResult.iterator().next(); + assertNotNull(locality); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getLocalitiesWithAdministrativeDivision(HttpClient httpClient) { + String localityAdministraiveDivision = this + .getClientWithConnectionString(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", null).iterator().next().getAdministrativeDivision() + .getAbbreviatedName(); + PagedIterable localitiesResult = this + .getClientWithConnectionString(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", localityAdministraiveDivision); + PhoneNumberLocality locality = localitiesResult.iterator().next(); + assertNotNull(locality); + assertEquals(locality.getAdministrativeDivision().getAbbreviatedName(), localityAdministraiveDivision); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getOfferings(HttpClient httpClient) { + PagedIterable offeringsResult = this + .getClientWithConnectionString(httpClient, "listAvailableOfferings") + .listAvailableOfferings("US", null, null); + PhoneNumberOffering offering = offeringsResult.iterator().next(); + assertNotNull(offering); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getTollFreeAreaCodesWithAAD(HttpClient httpClient) { + PagedIterable areaCodesResult = this + .getClientWithManagedIdentity(httpClient, "listAvailableTollFreeAreaCodes") + .listAvailableTollFreeAreaCodes("US"); + String[] expectedAreaCodes = { "888", "877", "866", "855", "844", "800", "833", "88" }; + for (PhoneNumberAreaCode areaCode : areaCodesResult) { + assertTrue(Arrays.asList(expectedAreaCodes).contains(areaCode)); + } + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getGeographicAreaCodesWithAAD(HttpClient httpClient) { + PhoneNumberLocality locality = this.getClientWithConnectionString(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", null).iterator().next(); + PagedIterable areaCodesResult = this + .getClientWithManagedIdentity(httpClient, "listAvailableGeographicAreaCodes") + .listAvailableGeographicAreaCodes("US", PhoneNumberAssignmentType.PERSON, + locality.getLocalizedName(), + locality.getAdministrativeDivision().getAbbreviatedName()); + PhoneNumberAreaCode areaCodes = areaCodesResult.iterator().next(); + assertNotNull(areaCodes); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getCountriesWithAAD(HttpClient httpClient) { + PagedIterable countriesResult = this + .getClientWithManagedIdentity(httpClient, "listAvailableCountries") + .listAvailableCountries(); + PhoneNumberCountry country = countriesResult.iterator().next(); + assertNotNull(country); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getLocalitiesWithAAD(HttpClient httpClient) { + PagedIterable localitiesResult = this + .getClientWithManagedIdentity(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", null); + PhoneNumberLocality locality = localitiesResult.iterator().next(); + assertNotNull(locality); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getLocalitiesWithAdministrativeDivisionWithAAD(HttpClient httpClient) { + PagedIterable localities = this + .getClientWithManagedIdentity(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", null); + PhoneNumberLocality localityWithAD = localities.iterator().next(); + + PagedIterable localitiesResult = this + .getClientWithManagedIdentity(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", + localityWithAD.getAdministrativeDivision().getAbbreviatedName()); + PhoneNumberLocality locality = localitiesResult.iterator().next(); + assertNotNull(locality); + assertEquals(locality.getAdministrativeDivision().getAbbreviatedName(), + localityWithAD.getAdministrativeDivision().getAbbreviatedName()); + } + + @ParameterizedTest + @MethodSource("com.azure.core.test.TestBase#getHttpClients") + public void getOfferingsWithAAD(HttpClient httpClient) { + PagedIterable offeringsResult = this + .getClientWithManagedIdentity(httpClient, "listAvailableOfferings") + .listAvailableOfferings("US", null, null); + PhoneNumberOffering offering = offeringsResult.iterator().next(); + assertNotNull(offering); + } + + private SyncPoller beginSearchAvailablePhoneNumbersHelper( + HttpClient httpClient, String testName, boolean withContext) { + PhoneNumberCapabilities capabilities = new PhoneNumberCapabilities(); + capabilities.setCalling(PhoneNumberCapabilityType.INBOUND); + capabilities.setSms(PhoneNumberCapabilityType.INBOUND_OUTBOUND); + PhoneNumberSearchOptions searchOptions = new PhoneNumberSearchOptions().setQuantity(1); + + if (withContext) { + return setPollInterval(getClientWithConnectionString(httpClient, testName) + .beginSearchAvailablePhoneNumbers( + COUNTRY_CODE, + PhoneNumberType.TOLL_FREE, + PhoneNumberAssignmentType.APPLICATION, + capabilities, + searchOptions, + Context.NONE)); + } + return setPollInterval( + getClientWithConnectionString(httpClient, testName).beginSearchAvailablePhoneNumbers( + COUNTRY_CODE, + PhoneNumberType.TOLL_FREE, + PhoneNumberAssignmentType.APPLICATION, + capabilities)); + } + + private SyncPoller beginPurchasePhoneNumbersHelper( + HttpClient httpClient, String searchId, String testName, boolean withContext) { + if (withContext) { + return setPollInterval(this.getClientWithConnectionString(httpClient, testName) + .beginPurchasePhoneNumbers(searchId, Context.NONE)); + } + return setPollInterval(this.getClientWithConnectionString(httpClient, testName) + .beginPurchasePhoneNumbers(searchId)); + } + + private SyncPoller beginReleasePhoneNumberHelper( + HttpClient httpClient, String phoneNumber, String testName, boolean withContext) { + if (getTestMode() == TestMode.PLAYBACK) { + phoneNumber = "+REDACTED"; + } + if (withContext) { + return setPollInterval(this.getClientWithConnectionString(httpClient, testName) + .beginReleasePhoneNumber(phoneNumber, Context.NONE)); + } + return setPollInterval(this.getClientWithConnectionString(httpClient, testName) + .beginReleasePhoneNumber(phoneNumber)); + } + + private SyncPoller beginUpdatePhoneNumberCapabilitiesHelper( + HttpClient httpClient, String phoneNumber, String testName, boolean withContext) { + PhoneNumbersClient client = this.getClientWithConnectionString(httpClient, testName); + Response responseAcquiredPhone = client.getPurchasedPhoneNumberWithResponse( + phoneNumber, + Context.NONE); + PhoneNumberCapabilities capabilities = new PhoneNumberCapabilities(); + capabilities.setCalling( + responseAcquiredPhone.getValue().getCapabilities() + .getCalling() == PhoneNumberCapabilityType.INBOUND + ? PhoneNumberCapabilityType.OUTBOUND + : PhoneNumberCapabilityType.INBOUND); + capabilities.setSms(responseAcquiredPhone.getValue().getCapabilities() + .getSms() == PhoneNumberCapabilityType.INBOUND_OUTBOUND + ? PhoneNumberCapabilityType.OUTBOUND + : PhoneNumberCapabilityType.INBOUND_OUTBOUND); + if (withContext) { + return setPollInterval(client.beginUpdatePhoneNumberCapabilities(phoneNumber, capabilities, + Context.NONE)); + } + return setPollInterval(client.beginUpdatePhoneNumberCapabilities(phoneNumber, capabilities)); + } + + private SyncPoller setPollInterval(SyncPoller syncPoller) { + return interceptorManager.isPlaybackMode() + ? syncPoller.setPollInterval(Duration.ofMillis(1)) + : syncPoller.setPollInterval(Duration.ofSeconds(1)); + } + + private PhoneNumbersClient getClientWithConnectionString(HttpClient httpClient, String testName) { + PhoneNumbersClientBuilder builder = super.getClientBuilderWithConnectionString(httpClient); + return addLoggingPolicy(builder, testName).buildClient(); + } + + private PhoneNumbersClient getClientWithManagedIdentity(HttpClient httpClient, String testName) { + PhoneNumbersClientBuilder builder = super.getClientBuilderUsingManagedIdentity(httpClient); + return addLoggingPolicy(builder, testName).buildClient(); + } } From c4ce6b77b21dd8ec2248a924fcef3387c7cf783d Mon Sep 17 00:00:00 2001 From: Sofia Robles Sandoval Date: Mon, 16 Oct 2023 11:05:01 -0600 Subject: [PATCH 07/11] Format issues --- ...honeNumbersAsyncClientIntegrationTest.java | 237 ++++++++---------- .../PhoneNumbersClientIntegrationTest.java | 126 ++++------ 2 files changed, 149 insertions(+), 214 deletions(-) diff --git a/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersAsyncClientIntegrationTest.java b/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersAsyncClientIntegrationTest.java index 6f8b8a15fc27..ae56fe47f0c0 100644 --- a/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersAsyncClientIntegrationTest.java +++ b/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersAsyncClientIntegrationTest.java @@ -82,8 +82,7 @@ public void getPurchasedPhoneNumberWithResponse(HttpClient httpClient) { @MethodSource("com.azure.core.test.TestBase#getHttpClients") public void listPurchasedPhoneNumbers(HttpClient httpClient) { StepVerifier.create( - this.getClientWithConnectionString(httpClient, "listPurchasedPhoneNumbers") - .listPurchasedPhoneNumbers() + this.getClientWithConnectionString(httpClient, "listPurchasedPhoneNumbers").listPurchasedPhoneNumbers() .next()) .assertNext((PurchasedPhoneNumber number) -> { assertNotNull(number.getPhoneNumber()); @@ -96,73 +95,66 @@ public void listPurchasedPhoneNumbers(HttpClient httpClient) { @MethodSource("com.azure.core.test.TestBase#getHttpClients") @DisabledIfEnvironmentVariable(named = "COMMUNICATION_SKIP_INT_PHONENUMBERS_TEST", matches = "(?i)(true)") public void beginSearchAvailablePhoneNumbers(HttpClient httpClient) { - PhoneNumbersAsyncClient client = this.getClientWithConnectionString(httpClient, - "beginSearchAvailablePhoneNumbers"); + PhoneNumbersAsyncClient client = + this.getClientWithConnectionString(httpClient, "beginSearchAvailablePhoneNumbers"); StepVerifier.create( - beginSearchAvailablePhoneNumbersHelper(client, true).last() - .flatMap((AsyncPollResponse result) -> { - return result.getFinalResult(); - })) - .assertNext((PhoneNumberSearchResult searchResult) -> { - assertEquals(searchResult.getPhoneNumbers().size(), 1); - assertNotNull(searchResult.getSearchId()); - }) - .verifyComplete(); + beginSearchAvailablePhoneNumbersHelper(client, true).last() + .flatMap((AsyncPollResponse result) -> { + return result.getFinalResult(); + })) + .assertNext((PhoneNumberSearchResult searchResult) -> { + assertEquals(searchResult.getPhoneNumbers().size(), 1); + assertNotNull(searchResult.getSearchId()); + }) + .verifyComplete(); } @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") @DisabledIfEnvironmentVariable(named = "COMMUNICATION_SKIP_INT_PHONENUMBERS_TEST", matches = "(?i)(true)") public void beginSearchAvailablePhoneNumbersWithoutOptions(HttpClient httpClient) { - PhoneNumbersAsyncClient client = this.getClientWithConnectionString(httpClient, - "getPurchasedPhoneNumberForCapabilities"); + PhoneNumbersAsyncClient client = + this.getClientWithConnectionString(httpClient, "getPurchasedPhoneNumberForCapabilities"); StepVerifier.create( - beginSearchAvailablePhoneNumbersHelper(client, false).last() - .flatMap((AsyncPollResponse result) -> { - return result.getFinalResult(); - })) - .assertNext((PhoneNumberSearchResult searchResult) -> { - assertEquals(searchResult.getPhoneNumbers().size(), 1); - assertNotNull(searchResult.getSearchId()); - }) - .verifyComplete(); + beginSearchAvailablePhoneNumbersHelper(client, false).last() + .flatMap((AsyncPollResponse result) -> { + return result.getFinalResult(); + })) + .assertNext((PhoneNumberSearchResult searchResult) -> { + assertEquals(searchResult.getPhoneNumbers().size(), 1); + assertNotNull(searchResult.getSearchId()); + }) + .verifyComplete(); } @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") @DisabledIfEnvironmentVariable(named = "SKIP_LIVE_TEST", matches = "(?i)(true)") public void beginPurchaseandReleasePhoneNumbers(HttpClient httpClient) { - PhoneNumbersAsyncClient client = this.getClientWithConnectionString(httpClient, - "getPurchasedPhoneNumberForCapabilities"); + PhoneNumbersAsyncClient client = + this.getClientWithConnectionString(httpClient, "getPurchasedPhoneNumberForCapabilities"); StepVerifier.create( - beginSearchAvailablePhoneNumbersHelper(client, true).last() - .flatMap((AsyncPollResponse result) -> { - return result.getFinalResult() - .flatMap((PhoneNumberSearchResult searchResult) -> { - String phoneNumber = searchResult - .getPhoneNumbers() - .get(0); - return beginPurchasePhoneNumbersHelper( - client, - searchResult.getSearchId()) - .last() - .flatMap(( - AsyncPollResponse purchaseResult) -> { - assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, - purchaseResult.getStatus()); - return beginReleasePhoneNumberHelper( - client, - phoneNumber) - .last(); - }); - }); - })) - .assertNext((AsyncPollResponse releaseResult) -> { - assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, - releaseResult.getStatus()); - - }) - .verifyComplete(); + beginSearchAvailablePhoneNumbersHelper(client, true).last() + .flatMap((AsyncPollResponse result) -> { + return result.getFinalResult() + .flatMap((PhoneNumberSearchResult searchResult) -> { + String phoneNumber = searchResult.getPhoneNumbers().get(0); + return beginPurchasePhoneNumbersHelper(client, searchResult.getSearchId() + ).last() + .flatMap(( + AsyncPollResponse purchaseResult) -> { + assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, + purchaseResult.getStatus()); + return beginReleasePhoneNumberHelper(client, phoneNumber + ).last(); + }); + }); + })) + .assertNext((AsyncPollResponse releaseResult) -> { + assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, releaseResult.getStatus()); + + }) + .verifyComplete(); } @ParameterizedTest @@ -171,36 +163,32 @@ public void beginPurchaseandReleasePhoneNumbers(HttpClient httpClient) { @DisabledIfEnvironmentVariable(named = "SKIP_UPDATE_CAPABILITIES_LIVE_TESTS", matches = "(?i)(true)") public void beginUpdatePhoneNumberCapabilities(HttpClient httpClient) { String phoneNumber = getTestPhoneNumber(); - PhoneNumbersAsyncClient client = this.getClientWithConnectionString(httpClient, - "getPurchasedPhoneNumberForCapabilities"); + PhoneNumbersAsyncClient client = + this.getClientWithConnectionString(httpClient, "getPurchasedPhoneNumberForCapabilities"); StepVerifier.create( - client.getPurchasedPhoneNumberWithResponse(phoneNumber) - .flatMap(responseAcquiredPhone -> { - PhoneNumberCapabilities capabilities = new PhoneNumberCapabilities(); - capabilities.setCalling(responseAcquiredPhone.getValue() - .getCapabilities() - .getCalling() == PhoneNumberCapabilityType.INBOUND - ? PhoneNumberCapabilityType.OUTBOUND - : PhoneNumberCapabilityType.INBOUND); - capabilities.setSms(responseAcquiredPhone.getValue() - .getCapabilities() - .getSms() == PhoneNumberCapabilityType.INBOUND_OUTBOUND - ? PhoneNumberCapabilityType.OUTBOUND - : PhoneNumberCapabilityType.INBOUND_OUTBOUND); - return beginUpdatePhoneNumberCapabilitiesHelper(client, - phoneNumber, capabilities) - .last() - .flatMap((AsyncPollResponse result) -> { - assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, - result.getStatus()); - assertEquals(PhoneNumberOperationStatus.SUCCEEDED, - result.getValue() - .getStatus()); - return result.getFinalResult(); - }); - })) - .assertNext(Assertions::assertNotNull) - .verifyComplete(); + client.getPurchasedPhoneNumberWithResponse(phoneNumber) + .flatMap(responseAcquiredPhone -> { + PhoneNumberCapabilities capabilities = new PhoneNumberCapabilities(); + capabilities.setCalling(responseAcquiredPhone.getValue().getCapabilities() + .getCalling() == PhoneNumberCapabilityType.INBOUND + ? PhoneNumberCapabilityType.OUTBOUND + : PhoneNumberCapabilityType.INBOUND); + capabilities.setSms(responseAcquiredPhone.getValue().getCapabilities() + .getSms() == PhoneNumberCapabilityType.INBOUND_OUTBOUND + ? PhoneNumberCapabilityType.OUTBOUND + : PhoneNumberCapabilityType.INBOUND_OUTBOUND); + return beginUpdatePhoneNumberCapabilitiesHelper(client, phoneNumber, capabilities) + .last() + .flatMap((AsyncPollResponse result) -> { + assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, + result.getStatus()); + assertEquals(PhoneNumberOperationStatus.SUCCEEDED, + result.getValue().getStatus()); + return result.getFinalResult(); + }); + })) + .assertNext(Assertions::assertNotNull) + .verifyComplete(); } @ParameterizedTest @@ -216,8 +204,7 @@ public void getPurchasedPhoneNumberNullNumber(HttpClient httpClient) { @MethodSource("com.azure.core.test.TestBase#getHttpClients") public void getPurchasedPhoneNumberWithResponseNullNumber(HttpClient httpClient) { StepVerifier.create( - this.getClientWithConnectionString(httpClient, - "getPurchasedPhoneNumberWithResponseNullNumber") + this.getClientWithConnectionString(httpClient, "getPurchasedPhoneNumberWithResponseNullNumber") .getPurchasedPhoneNumberWithResponse(null)) .verifyError(); } @@ -226,8 +213,7 @@ public void getPurchasedPhoneNumberWithResponseNullNumber(HttpClient httpClient) @MethodSource("com.azure.core.test.TestBase#getHttpClients") public void beginSearchAvailablePhoneNumbersNullCountryCode(HttpClient httpClient) { StepVerifier.create( - this.getClientWithConnectionString(httpClient, - "beginSearchAvailablePhoneNumbersNullCountryCode") + this.getClientWithConnectionString(httpClient, "beginSearchAvailablePhoneNumbersNullCountryCode") .beginSearchAvailablePhoneNumbers(null, PhoneNumberType.TOLL_FREE, PhoneNumberAssignmentType.APPLICATION, null, null)) .verifyError(); @@ -237,10 +223,8 @@ public void beginSearchAvailablePhoneNumbersNullCountryCode(HttpClient httpClien @MethodSource("com.azure.core.test.TestBase#getHttpClients") public void beginUpdatePhoneNumberCapabilitiesNullPhoneNumber(HttpClient httpClient) { StepVerifier.create( - this.getClientWithConnectionString(httpClient, - "beginUpdatePhoneNumberCapabilitiesNullPhoneNumber") - .beginUpdatePhoneNumberCapabilities(null, - new PhoneNumberCapabilities())) + this.getClientWithConnectionString(httpClient, "beginUpdatePhoneNumberCapabilitiesNullPhoneNumber") + .beginUpdatePhoneNumberCapabilities(null, new PhoneNumberCapabilities())) .verifyError(); } @@ -250,10 +234,10 @@ public void beginUpdatePhoneNumberCapabilitiesUnauthorizedPhoneNumber(HttpClient PhoneNumberCapabilities capabilities = new PhoneNumberCapabilities(); capabilities.setCalling(PhoneNumberCapabilityType.INBOUND); StepVerifier.create( - this.getClientWithConnectionString(httpClient, - "beginUpdatePhoneNumberCapabilitiesUnauthorizedPhoneNumber") - .beginUpdatePhoneNumberCapabilities("+14255555111", capabilities)) - .verifyError(); + this.getClientWithConnectionString(httpClient, "beginUpdatePhoneNumberCapabilitiesUnauthorizedPhoneNumber") + .beginUpdatePhoneNumberCapabilities("+14255555111", capabilities) + ) + .verifyError(); } @ParameterizedTest @@ -262,11 +246,10 @@ public void beginUpdatePhoneNumberCapabilitiesInvalidPhoneNumber(HttpClient http PhoneNumberCapabilities capabilities = new PhoneNumberCapabilities(); capabilities.setCalling(PhoneNumberCapabilityType.INBOUND); StepVerifier.create( - this.getClientWithConnectionString(httpClient, - "beginUpdatePhoneNumberCapabilitiesInvalidPhoneNumber") - .beginUpdatePhoneNumberCapabilities("invalid-phone-number", - capabilities)) - .verifyError(); + this.getClientWithConnectionString(httpClient, "beginUpdatePhoneNumberCapabilitiesInvalidPhoneNumber") + .beginUpdatePhoneNumberCapabilities("invalid-phone-number", capabilities) + ) + .verifyError(); } @ParameterizedTest @@ -274,10 +257,8 @@ public void beginUpdatePhoneNumberCapabilitiesInvalidPhoneNumber(HttpClient http public void getTollFreeAreaCodesWithAAD(HttpClient httpClient) { StepVerifier.create( this.getClientWithManagedIdentity(httpClient, "listAvailableTollFreeAreaCodes") - .listAvailableTollFreeAreaCodes("US", - PhoneNumberAssignmentType.APPLICATION) - .next()) - .expectAccessibleContext(); + .listAvailableTollFreeAreaCodes("US", PhoneNumberAssignmentType.APPLICATION).next()) + .verifyComplete(); } @ParameterizedTest @@ -287,11 +268,8 @@ public void getGeographicAreaCodesWithAAD(HttpClient httpClient) { .listAvailableLocalities("US", null).blockFirst(); StepVerifier.create( this.getClientWithManagedIdentity(httpClient, "listAvailableGeographicAreaCodes") - .listAvailableGeographicAreaCodes("US", - PhoneNumberAssignmentType.PERSON, - locality.getLocalizedName(), - locality.getAdministrativeDivision() - .getAbbreviatedName()) + .listAvailableGeographicAreaCodes("US", PhoneNumberAssignmentType.PERSON, + locality.getLocalizedName(), locality.getAdministrativeDivision().getAbbreviatedName()) .next()) .assertNext((PhoneNumberAreaCode areaCodes) -> { assertNotNull(areaCodes); @@ -303,8 +281,7 @@ public void getGeographicAreaCodesWithAAD(HttpClient httpClient) { @MethodSource("com.azure.core.test.TestBase#getHttpClients") public void getCountriesWithAAD(HttpClient httpClient) { StepVerifier.create( - this.getClientWithManagedIdentity(httpClient, "listAvailableCountries") - .listAvailableCountries().next()) + this.getClientWithManagedIdentity(httpClient, "listAvailableCountries").listAvailableCountries().next()) .assertNext((PhoneNumberCountry country) -> { assertNotNull(country); }) @@ -330,14 +307,10 @@ public void getLocalitiesAdministrativeDivisionWithAAD(HttpClient httpClient) { .listAvailableLocalities("US", null).blockFirst(); StepVerifier.create( this.getClientWithManagedIdentity(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", - locality.getAdministrativeDivision() - .getAbbreviatedName()) - .next()) + .listAvailableLocalities("US", locality.getAdministrativeDivision().getAbbreviatedName()).next()) .assertNext((PhoneNumberLocality localityWithAD) -> { assertNotNull(localityWithAD); - assertEquals(localityWithAD.getAdministrativeDivision().getAbbreviatedName(), - locality.getAdministrativeDivision().getAbbreviatedName()); + assertEquals(localityWithAD.getAdministrativeDivision().getAbbreviatedName(), locality.getAdministrativeDivision().getAbbreviatedName()); }) .verifyComplete(); } @@ -359,10 +332,8 @@ public void getOfferingsWithAAD(HttpClient httpClient) { public void getTollFreeAreaCodes(HttpClient httpClient) { StepVerifier.create( this.getClientWithConnectionString(httpClient, "listAvailableTollFreeAreaCodes") - .listAvailableTollFreeAreaCodes("US", - PhoneNumberAssignmentType.APPLICATION) - .next()) - .expectAccessibleContext(); + .listAvailableTollFreeAreaCodes("US", PhoneNumberAssignmentType.APPLICATION).next()) + .verifyComplete(); } @ParameterizedTest @@ -372,11 +343,8 @@ public void getGeographicAreaCodes(HttpClient httpClient) { .listAvailableLocalities("US", null).blockFirst(); StepVerifier.create( this.getClientWithConnectionString(httpClient, "listAvailableGeographicAreaCodes") - .listAvailableGeographicAreaCodes("US", - PhoneNumberAssignmentType.PERSON, - locality.getLocalizedName(), - locality.getAdministrativeDivision() - .getAbbreviatedName()) + .listAvailableGeographicAreaCodes("US", PhoneNumberAssignmentType.PERSON, + locality.getLocalizedName(), locality.getAdministrativeDivision().getAbbreviatedName()) .next()) .assertNext((PhoneNumberAreaCode areaCodes) -> { assertNotNull(areaCodes); @@ -388,8 +356,7 @@ public void getGeographicAreaCodes(HttpClient httpClient) { @MethodSource("com.azure.core.test.TestBase#getHttpClients") public void getCountries(HttpClient httpClient) { StepVerifier.create( - this.getClientWithConnectionString(httpClient, "listAvailableCountries") - .listAvailableCountries() + this.getClientWithConnectionString(httpClient, "listAvailableCountries").listAvailableCountries() .next()) .assertNext((PhoneNumberCountry country) -> { assertNotNull(country); @@ -412,10 +379,8 @@ public void getLocalities(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") public void getLocalitiesAdministrativeDivision(HttpClient httpClient) { - String localityAdministraiveDivision = this - .getClientWithConnectionString(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", null).blockFirst().getAdministrativeDivision() - .getAbbreviatedName(); + String localityAdministraiveDivision = this.getClientWithConnectionString(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", null).blockFirst().getAdministrativeDivision().getAbbreviatedName(); StepVerifier.create( this.getClientWithConnectionString(httpClient, "listAvailableLocalities") .listAvailableLocalities("US", localityAdministraiveDivision).next()) @@ -440,7 +405,7 @@ public void getOfferings(HttpClient httpClient) { } private PollerFlux beginSearchAvailablePhoneNumbersHelper( - PhoneNumbersAsyncClient client, boolean withOptions) { + PhoneNumbersAsyncClient client, boolean withOptions) { PhoneNumberCapabilities capabilities = new PhoneNumberCapabilities(); capabilities.setCalling(PhoneNumberCapabilityType.INBOUND); capabilities.setSms(PhoneNumberCapabilityType.INBOUND_OUTBOUND); @@ -464,19 +429,19 @@ private PollerFlux beginSearchAva } private PollerFlux beginPurchasePhoneNumbersHelper( - PhoneNumbersAsyncClient client, String searchId) { + PhoneNumbersAsyncClient client, String searchId) { return setPollInterval(client .beginPurchasePhoneNumbers(searchId)); } private PollerFlux beginReleasePhoneNumberHelper( - PhoneNumbersAsyncClient client, String phoneNumber) { + PhoneNumbersAsyncClient client, String phoneNumber) { return setPollInterval(client .beginReleasePhoneNumber(phoneNumber)); } private PollerFlux beginUpdatePhoneNumberCapabilitiesHelper( - PhoneNumbersAsyncClient client, String phoneNumber, PhoneNumberCapabilities capabilities) { + PhoneNumbersAsyncClient client, String phoneNumber, PhoneNumberCapabilities capabilities) { return setPollInterval(client .beginUpdatePhoneNumberCapabilities(phoneNumber, capabilities)); diff --git a/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersClientIntegrationTest.java b/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersClientIntegrationTest.java index c3c0863ce838..aa551f2f0f11 100644 --- a/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersClientIntegrationTest.java +++ b/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersClientIntegrationTest.java @@ -31,6 +31,7 @@ import java.time.Duration; import java.util.Arrays; +import java.util.stream.Stream; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -43,8 +44,7 @@ public class PhoneNumbersClientIntegrationTest extends PhoneNumbersIntegrationTe @MethodSource("com.azure.core.test.TestBase#getHttpClients") public void getPurchasedPhoneNumber(HttpClient httpClient) { String phoneNumber = redactIfPlaybackMode(getTestPhoneNumber()); - PurchasedPhoneNumber number = this - .getClientWithConnectionString(httpClient, "getPurchasedPhoneNumberSync") + PurchasedPhoneNumber number = this.getClientWithConnectionString(httpClient, "getPurchasedPhoneNumberSync") .getPurchasedPhoneNumber(phoneNumber); assertEquals(phoneNumber, number.getPhoneNumber()); assertEquals(COUNTRY_CODE, number.getCountryCode()); @@ -89,8 +89,7 @@ public void listPurchasedPhoneNumbers(HttpClient httpClient) { @MethodSource("com.azure.core.test.TestBase#getHttpClients") public void listPurchasedPhoneNumbersWithoutContext(HttpClient httpClient) { PagedIterable numbers = this - .getClientWithConnectionString(httpClient, "listPurchasedPhoneNumbersSync") - .listPurchasedPhoneNumbers(); + .getClientWithConnectionString(httpClient, "listPurchasedPhoneNumbersSync").listPurchasedPhoneNumbers(); PurchasedPhoneNumber number = numbers.iterator().next(); assertNotNull(number.getPhoneNumber()); assertEquals(COUNTRY_CODE, number.getCountryCode()); @@ -117,26 +116,19 @@ public void beginSearchAvailablePhoneNumbers(HttpClient httpClient) { @DisabledIfEnvironmentVariable(named = "SKIP_LIVE_TEST", matches = "(?i)(true)") public void beginPurchaseandReleasePhoneNumbersWithoutContext(HttpClient httpClient) { SyncPoller poller = beginSearchAvailablePhoneNumbersHelper( - httpClient, - "beginPurchaseandReleasePhoneNumbers_beginSearchAvailablePhoneNumbersWithoutContextSync", + httpClient, "beginPurchaseandReleasePhoneNumbers_beginSearchAvailablePhoneNumbersWithoutContextSync", false); PollResponse response = poller.waitForCompletion(); if (LongRunningOperationStatus.SUCCESSFULLY_COMPLETED == response.getStatus()) { PhoneNumberSearchResult searchResult = poller.getFinalResult(); String phoneNumber = searchResult.getPhoneNumbers().get(0); - PollResponse purchaseOperationResponse = beginPurchasePhoneNumbersHelper( - httpClient, - searchResult.getSearchId(), "beginPurchasePhoneNumbersWithoutContextSync", - false) - .waitForCompletion(); - assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, - purchaseOperationResponse.getStatus()); - PollResponse releaseOperationResponse = beginReleasePhoneNumberHelper( - httpClient, - phoneNumber, "beginReleasePhoneNumberWithoutContextSync", false) + PollResponse purchaseOperationResponse = beginPurchasePhoneNumbersHelper(httpClient, + searchResult.getSearchId(), "beginPurchasePhoneNumbersWithoutContextSync", false) .waitForCompletion(); - assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, - releaseOperationResponse.getStatus()); + assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, purchaseOperationResponse.getStatus()); + PollResponse releaseOperationResponse = beginReleasePhoneNumberHelper(httpClient, + phoneNumber, "beginReleasePhoneNumberWithoutContextSync", false).waitForCompletion(); + assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, releaseOperationResponse.getStatus()); } else { fail("Long Running Operation Status was not successfully completed"); } @@ -147,23 +139,17 @@ public void beginPurchaseandReleasePhoneNumbersWithoutContext(HttpClient httpCli @DisabledIfEnvironmentVariable(named = "SKIP_LIVE_TEST", matches = "(?i)(true)") public void beginPurchaseandReleasePhoneNumbers(HttpClient httpClient) { SyncPoller poller = beginSearchAvailablePhoneNumbersHelper( - httpClient, "beginPurchaseandReleasePhoneNumbers_beginSearchAvailablePhoneNumbersSync", - true); + httpClient, "beginPurchaseandReleasePhoneNumbers_beginSearchAvailablePhoneNumbersSync", true); PollResponse response = poller.waitForCompletion(); if (LongRunningOperationStatus.SUCCESSFULLY_COMPLETED == response.getStatus()) { PhoneNumberSearchResult searchResult = poller.getFinalResult(); String phoneNumber = searchResult.getPhoneNumbers().get(0); - PollResponse purchaseOperationResponse = beginPurchasePhoneNumbersHelper( - httpClient, - searchResult.getSearchId(), "beginPurchasePhoneNumbersSync", true) - .waitForCompletion(); - assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, - purchaseOperationResponse.getStatus()); - PollResponse releaseOperationResponse = beginReleasePhoneNumberHelper( - httpClient, + PollResponse purchaseOperationResponse = beginPurchasePhoneNumbersHelper(httpClient, + searchResult.getSearchId(), "beginPurchasePhoneNumbersSync", true).waitForCompletion(); + assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, purchaseOperationResponse.getStatus()); + PollResponse releaseOperationResponse = beginReleasePhoneNumberHelper(httpClient, phoneNumber, "beginReleasePhoneNumberSync", true).waitForCompletion(); - assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, - releaseOperationResponse.getStatus()); + assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, releaseOperationResponse.getStatus()); } else { fail("Long Running Operation Status was not successfully completed"); } @@ -174,8 +160,7 @@ public void beginPurchaseandReleasePhoneNumbers(HttpClient httpClient) { @DisabledIfEnvironmentVariable(named = "COMMUNICATION_SKIP_INT_PHONENUMBERS_TEST", matches = "(?i)(true)") public void beginUpdatePhoneNumberCapabilitiesWithoutContext(HttpClient httpClient) { String phoneNumber = getTestPhoneNumber(); - PollResponse result = beginUpdatePhoneNumberCapabilitiesHelper(httpClient, - phoneNumber, + PollResponse result = beginUpdatePhoneNumberCapabilitiesHelper(httpClient, phoneNumber, "beginUpdatePhoneNumberCapabilitiesWithoutContextSync", false).waitForCompletion(); assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, result.getStatus()); assertEquals(PhoneNumberOperationStatus.SUCCEEDED, result.getValue().getStatus()); @@ -187,8 +172,7 @@ public void beginUpdatePhoneNumberCapabilitiesWithoutContext(HttpClient httpClie @DisabledIfEnvironmentVariable(named = "SKIP_UPDATE_CAPABILITIES_LIVE_TESTS", matches = "(?i)(true)") public void beginUpdatePhoneNumberCapabilities(HttpClient httpClient) { String phoneNumber = getTestPhoneNumber(); - PollResponse result = beginUpdatePhoneNumberCapabilitiesHelper(httpClient, - phoneNumber, + PollResponse result = beginUpdatePhoneNumberCapabilitiesHelper(httpClient, phoneNumber, "beginUpdatePhoneNumberCapabilities", true).waitForCompletion(); assertEquals(LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, result.getStatus()); assertEquals(PhoneNumberOperationStatus.SUCCEEDED, result.getValue().getStatus()); @@ -200,9 +184,9 @@ public void getTollFreeAreaCodes(HttpClient httpClient) { PagedIterable areaCodesResult = this .getClientWithConnectionString(httpClient, "listAvailableTollFreeAreaCodes") .listAvailableTollFreeAreaCodes("US"); - String[] expectedAreaCodes = { "888", "877", "866", "855", "844", "800", "833", "88" }; + String[] expectedAreaCodes = { "888", "877", "866", "855", "844", "800", "833", "88" }; for (PhoneNumberAreaCode areaCode : areaCodesResult) { - assertTrue(Arrays.asList(expectedAreaCodes).contains(areaCode)); + assertTrue(Arrays.asList(expectedAreaCodes).contains(areaCode)); } } @@ -213,8 +197,7 @@ public void getGeographicAreaCodes(HttpClient httpClient) { .listAvailableLocalities("US", null).iterator().next(); PagedIterable areaCodesResult = this .getClientWithConnectionString(httpClient, "listAvailableGeographicAreaCodes") - .listAvailableGeographicAreaCodes("US", PhoneNumberAssignmentType.PERSON, - locality.getLocalizedName(), + .listAvailableGeographicAreaCodes("US", PhoneNumberAssignmentType.PERSON, locality.getLocalizedName(), locality.getAdministrativeDivision().getAbbreviatedName()); PhoneNumberAreaCode areaCodes = areaCodesResult.iterator().next(); assertNotNull(areaCodes); @@ -224,8 +207,7 @@ public void getGeographicAreaCodes(HttpClient httpClient) { @MethodSource("com.azure.core.test.TestBase#getHttpClients") public void getCountries(HttpClient httpClient) { PagedIterable countriesResult = this - .getClientWithConnectionString(httpClient, "listAvailableCountries") - .listAvailableCountries(); + .getClientWithConnectionString(httpClient, "listAvailableCountries").listAvailableCountries(); PhoneNumberCountry country = countriesResult.iterator().next(); assertNotNull(country); } @@ -243,10 +225,8 @@ public void getLocalities(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") public void getLocalitiesWithAdministrativeDivision(HttpClient httpClient) { - String localityAdministraiveDivision = this - .getClientWithConnectionString(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", null).iterator().next().getAdministrativeDivision() - .getAbbreviatedName(); + String localityAdministraiveDivision = this.getClientWithConnectionString(httpClient, "listAvailableLocalities") + .listAvailableLocalities("US", null).iterator().next().getAdministrativeDivision().getAbbreviatedName(); PagedIterable localitiesResult = this .getClientWithConnectionString(httpClient, "listAvailableLocalities") .listAvailableLocalities("US", localityAdministraiveDivision); @@ -271,9 +251,9 @@ public void getTollFreeAreaCodesWithAAD(HttpClient httpClient) { PagedIterable areaCodesResult = this .getClientWithManagedIdentity(httpClient, "listAvailableTollFreeAreaCodes") .listAvailableTollFreeAreaCodes("US"); - String[] expectedAreaCodes = { "888", "877", "866", "855", "844", "800", "833", "88" }; + String[] expectedAreaCodes = { "888", "877", "866", "855", "844", "800", "833", "88" }; for (PhoneNumberAreaCode areaCode : areaCodesResult) { - assertTrue(Arrays.asList(expectedAreaCodes).contains(areaCode)); + assertTrue(Arrays.asList(expectedAreaCodes).contains(areaCode)); } } @@ -284,8 +264,7 @@ public void getGeographicAreaCodesWithAAD(HttpClient httpClient) { .listAvailableLocalities("US", null).iterator().next(); PagedIterable areaCodesResult = this .getClientWithManagedIdentity(httpClient, "listAvailableGeographicAreaCodes") - .listAvailableGeographicAreaCodes("US", PhoneNumberAssignmentType.PERSON, - locality.getLocalizedName(), + .listAvailableGeographicAreaCodes("US", PhoneNumberAssignmentType.PERSON, locality.getLocalizedName(), locality.getAdministrativeDivision().getAbbreviatedName()); PhoneNumberAreaCode areaCodes = areaCodesResult.iterator().next(); assertNotNull(areaCodes); @@ -295,8 +274,7 @@ public void getGeographicAreaCodesWithAAD(HttpClient httpClient) { @MethodSource("com.azure.core.test.TestBase#getHttpClients") public void getCountriesWithAAD(HttpClient httpClient) { PagedIterable countriesResult = this - .getClientWithManagedIdentity(httpClient, "listAvailableCountries") - .listAvailableCountries(); + .getClientWithManagedIdentity(httpClient, "listAvailableCountries").listAvailableCountries(); PhoneNumberCountry country = countriesResult.iterator().next(); assertNotNull(country); } @@ -321,12 +299,10 @@ public void getLocalitiesWithAdministrativeDivisionWithAAD(HttpClient httpClient PagedIterable localitiesResult = this .getClientWithManagedIdentity(httpClient, "listAvailableLocalities") - .listAvailableLocalities("US", - localityWithAD.getAdministrativeDivision().getAbbreviatedName()); + .listAvailableLocalities("US", localityWithAD.getAdministrativeDivision().getAbbreviatedName()); PhoneNumberLocality locality = localitiesResult.iterator().next(); assertNotNull(locality); - assertEquals(locality.getAdministrativeDivision().getAbbreviatedName(), - localityWithAD.getAdministrativeDivision().getAbbreviatedName()); + assertEquals(locality.getAdministrativeDivision().getAbbreviatedName(), localityWithAD.getAdministrativeDivision().getAbbreviatedName()); } @ParameterizedTest @@ -347,21 +323,19 @@ private SyncPoller beginSearchAva PhoneNumberSearchOptions searchOptions = new PhoneNumberSearchOptions().setQuantity(1); if (withContext) { - return setPollInterval(getClientWithConnectionString(httpClient, testName) - .beginSearchAvailablePhoneNumbers( - COUNTRY_CODE, - PhoneNumberType.TOLL_FREE, - PhoneNumberAssignmentType.APPLICATION, - capabilities, - searchOptions, - Context.NONE)); + return setPollInterval(getClientWithConnectionString(httpClient, testName).beginSearchAvailablePhoneNumbers( + COUNTRY_CODE, + PhoneNumberType.TOLL_FREE, + PhoneNumberAssignmentType.APPLICATION, + capabilities, + searchOptions, + Context.NONE)); } - return setPollInterval( - getClientWithConnectionString(httpClient, testName).beginSearchAvailablePhoneNumbers( - COUNTRY_CODE, - PhoneNumberType.TOLL_FREE, - PhoneNumberAssignmentType.APPLICATION, - capabilities)); + return setPollInterval(getClientWithConnectionString(httpClient, testName).beginSearchAvailablePhoneNumbers( + COUNTRY_CODE, + PhoneNumberType.TOLL_FREE, + PhoneNumberAssignmentType.APPLICATION, + capabilities)); } private SyncPoller beginPurchasePhoneNumbersHelper( @@ -390,22 +364,18 @@ private SyncPoller beginReleaseP private SyncPoller beginUpdatePhoneNumberCapabilitiesHelper( HttpClient httpClient, String phoneNumber, String testName, boolean withContext) { PhoneNumbersClient client = this.getClientWithConnectionString(httpClient, testName); - Response responseAcquiredPhone = client.getPurchasedPhoneNumberWithResponse( - phoneNumber, + Response responseAcquiredPhone = client.getPurchasedPhoneNumberWithResponse(phoneNumber, Context.NONE); PhoneNumberCapabilities capabilities = new PhoneNumberCapabilities(); capabilities.setCalling( - responseAcquiredPhone.getValue().getCapabilities() - .getCalling() == PhoneNumberCapabilityType.INBOUND - ? PhoneNumberCapabilityType.OUTBOUND - : PhoneNumberCapabilityType.INBOUND); - capabilities.setSms(responseAcquiredPhone.getValue().getCapabilities() - .getSms() == PhoneNumberCapabilityType.INBOUND_OUTBOUND + responseAcquiredPhone.getValue().getCapabilities().getCalling() == PhoneNumberCapabilityType.INBOUND ? PhoneNumberCapabilityType.OUTBOUND + : PhoneNumberCapabilityType.INBOUND); + capabilities.setSms(responseAcquiredPhone.getValue().getCapabilities() + .getSms() == PhoneNumberCapabilityType.INBOUND_OUTBOUND ? PhoneNumberCapabilityType.OUTBOUND : PhoneNumberCapabilityType.INBOUND_OUTBOUND); if (withContext) { - return setPollInterval(client.beginUpdatePhoneNumberCapabilities(phoneNumber, capabilities, - Context.NONE)); + return setPollInterval(client.beginUpdatePhoneNumberCapabilities(phoneNumber, capabilities, Context.NONE)); } return setPollInterval(client.beginUpdatePhoneNumberCapabilities(phoneNumber, capabilities)); } From 29ba96f993f657c8ac29d12d7d0ffc5403831fd2 Mon Sep 17 00:00:00 2001 From: Sofia Robles Sandoval Date: Mon, 16 Oct 2023 11:12:58 -0600 Subject: [PATCH 08/11] Replace async test --- .../PhoneNumbersAsyncClientIntegrationTest.java | 4 ++-- .../phonenumbers/PhoneNumbersClientIntegrationTest.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersAsyncClientIntegrationTest.java b/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersAsyncClientIntegrationTest.java index ae56fe47f0c0..25318966f0e0 100644 --- a/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersAsyncClientIntegrationTest.java +++ b/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersAsyncClientIntegrationTest.java @@ -258,7 +258,7 @@ public void getTollFreeAreaCodesWithAAD(HttpClient httpClient) { StepVerifier.create( this.getClientWithManagedIdentity(httpClient, "listAvailableTollFreeAreaCodes") .listAvailableTollFreeAreaCodes("US", PhoneNumberAssignmentType.APPLICATION).next()) - .verifyComplete(); + .expectAccessibleContext(); } @ParameterizedTest @@ -333,7 +333,7 @@ public void getTollFreeAreaCodes(HttpClient httpClient) { StepVerifier.create( this.getClientWithConnectionString(httpClient, "listAvailableTollFreeAreaCodes") .listAvailableTollFreeAreaCodes("US", PhoneNumberAssignmentType.APPLICATION).next()) - .verifyComplete(); + .expectAccessibleContext(); } @ParameterizedTest diff --git a/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersClientIntegrationTest.java b/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersClientIntegrationTest.java index aa551f2f0f11..288b4abcafe3 100644 --- a/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersClientIntegrationTest.java +++ b/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersClientIntegrationTest.java @@ -184,9 +184,9 @@ public void getTollFreeAreaCodes(HttpClient httpClient) { PagedIterable areaCodesResult = this .getClientWithConnectionString(httpClient, "listAvailableTollFreeAreaCodes") .listAvailableTollFreeAreaCodes("US"); - String[] expectedAreaCodes = { "888", "877", "866", "855", "844", "800", "833", "88" }; + String[] expectedAreaCodes = { "888", "877", "866", "855", "844", "800", "833", "88" }; for (PhoneNumberAreaCode areaCode : areaCodesResult) { - assertTrue(Arrays.asList(expectedAreaCodes).contains(areaCode)); + assertTrue(Arrays.asList(expectedAreaCodes).contains(areaCode)); } } @@ -251,9 +251,9 @@ public void getTollFreeAreaCodesWithAAD(HttpClient httpClient) { PagedIterable areaCodesResult = this .getClientWithManagedIdentity(httpClient, "listAvailableTollFreeAreaCodes") .listAvailableTollFreeAreaCodes("US"); - String[] expectedAreaCodes = { "888", "877", "866", "855", "844", "800", "833", "88" }; + String[] expectedAreaCodes = { "888", "877", "866", "855", "844", "800", "833", "88" }; for (PhoneNumberAreaCode areaCode : areaCodesResult) { - assertTrue(Arrays.asList(expectedAreaCodes).contains(areaCode)); + assertTrue(Arrays.asList(expectedAreaCodes).contains(areaCode)); } } From 21b098836805ebafd731c134d908f62b0f3eeb81 Mon Sep 17 00:00:00 2001 From: Sofia Robles Sandoval Date: Mon, 16 Oct 2023 11:27:14 -0600 Subject: [PATCH 09/11] Remove unsused import --- .../phonenumbers/PhoneNumbersClientIntegrationTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersClientIntegrationTest.java b/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersClientIntegrationTest.java index 288b4abcafe3..893369729159 100644 --- a/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersClientIntegrationTest.java +++ b/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersClientIntegrationTest.java @@ -31,7 +31,6 @@ import java.time.Duration; import java.util.Arrays; -import java.util.stream.Stream; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; From f6c4d918b8f9b46ef8c13706d86aeca7121f5f10 Mon Sep 17 00:00:00 2001 From: Sofia Robles Sandoval Date: Mon, 16 Oct 2023 11:41:41 -0600 Subject: [PATCH 10/11] Add assert not null --- .../phonenumbers/PhoneNumbersClientIntegrationTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersClientIntegrationTest.java b/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersClientIntegrationTest.java index 893369729159..69f7be3083bc 100644 --- a/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersClientIntegrationTest.java +++ b/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersClientIntegrationTest.java @@ -187,6 +187,7 @@ public void getTollFreeAreaCodes(HttpClient httpClient) { for (PhoneNumberAreaCode areaCode : areaCodesResult) { assertTrue(Arrays.asList(expectedAreaCodes).contains(areaCode)); } + assertNotNull(areaCodesResult); } @ParameterizedTest @@ -254,6 +255,7 @@ public void getTollFreeAreaCodesWithAAD(HttpClient httpClient) { for (PhoneNumberAreaCode areaCode : areaCodesResult) { assertTrue(Arrays.asList(expectedAreaCodes).contains(areaCode)); } + assertNotNull(areaCodesResult); } @ParameterizedTest From f1635698228ae1bf783c3be97cf42a8725d29983 Mon Sep 17 00:00:00 2001 From: Sofia Robles Sandoval Date: Mon, 16 Oct 2023 12:14:01 -0600 Subject: [PATCH 11/11] Fix area codes assert --- .../phonenumbers/PhoneNumbersClientIntegrationTest.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersClientIntegrationTest.java b/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersClientIntegrationTest.java index 69f7be3083bc..f1b465e8d8f5 100644 --- a/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersClientIntegrationTest.java +++ b/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersClientIntegrationTest.java @@ -31,6 +31,7 @@ import java.time.Duration; import java.util.Arrays; +import java.util.List; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -183,9 +184,9 @@ public void getTollFreeAreaCodes(HttpClient httpClient) { PagedIterable areaCodesResult = this .getClientWithConnectionString(httpClient, "listAvailableTollFreeAreaCodes") .listAvailableTollFreeAreaCodes("US"); - String[] expectedAreaCodes = { "888", "877", "866", "855", "844", "800", "833", "88" }; + List expectedAreaCodes = Arrays.asList("888", "877", "866", "855", "844", "800", "833", "88"); for (PhoneNumberAreaCode areaCode : areaCodesResult) { - assertTrue(Arrays.asList(expectedAreaCodes).contains(areaCode)); + assertTrue(expectedAreaCodes.contains(areaCode.getAreaCode())); } assertNotNull(areaCodesResult); } @@ -251,9 +252,9 @@ public void getTollFreeAreaCodesWithAAD(HttpClient httpClient) { PagedIterable areaCodesResult = this .getClientWithManagedIdentity(httpClient, "listAvailableTollFreeAreaCodes") .listAvailableTollFreeAreaCodes("US"); - String[] expectedAreaCodes = { "888", "877", "866", "855", "844", "800", "833", "88" }; + List expectedAreaCodes = Arrays.asList("888", "877", "866", "855", "844", "800", "833", "88"); for (PhoneNumberAreaCode areaCode : areaCodesResult) { - assertTrue(Arrays.asList(expectedAreaCodes).contains(areaCode)); + assertTrue(expectedAreaCodes.contains(areaCode.getAreaCode())); } assertNotNull(areaCodesResult); }