restore unintentionally modified tests

sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersAsyncClientIntegrationTest.java

@@ -264,10 +264,7 @@ public void getTollFreeAreaCodesWithAAD(HttpClient httpClient) {
         StepVerifier.create(
                 this.getClientWithManagedIdentity(httpClient, "listAvailableTollFreeAreaCodes")
                         .listAvailableTollFreeAreaCodes("US", PhoneNumberAssignmentType.APPLICATION).next())
-                .assertNext((PhoneNumberAreaCode areaCodes) -> {
-                    assertNotNull(areaCodes.getAreaCode());
-                })
-                .verifyComplete();
+                .expectAccessibleContext();
     }
 
     @ParameterizedTest
@@ -282,6 +279,7 @@ public void getGeographicAreaCodesWithAAD(HttpClient httpClient) {
                         .next())
                 .assertNext((PhoneNumberAreaCode areaCodes) -> {
                     assertNotNull(areaCodes);
+                    assertNotNull(areaCodes.getAreaCode());
                 })
                 .verifyComplete();
     }
@@ -320,6 +318,7 @@ public void getLocalitiesAdministrativeDivisionWithAAD(HttpClient httpClient) {
                 .assertNext((PhoneNumberLocality localityWithAD) -> {
                     assertNotNull(localityWithAD);
                     assertEquals(localityWithAD.getAdministrativeDivision().getAbbreviatedName(), locality.getAdministrativeDivision().getAbbreviatedName());
+                    assertEquals(localityWithAD.getAdministrativeDivision().getLocalizedName(), locality.getAdministrativeDivision().getLocalizedName());
                 })
                 .verifyComplete();
     }
@@ -332,7 +331,10 @@ public void getOfferingsWithAAD(HttpClient httpClient) {
                         .listAvailableOfferings("US", null, null).next())
                 .assertNext((PhoneNumberOffering offering) -> {
                     assertNotNull(offering);
-                })
+                    offering.getCost().getBillingFrequency();
+                    assertNotNull(BillingFrequency.values());
+                    assertNotNull(offering.getCost().getCurrencyCode());
+                    assertNotNull(offering.getCost().getAmount());                })
                 .verifyComplete();
     }
 
@@ -342,26 +344,37 @@ 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 getTollFreeAreaCodesWrongCountryCode(HttpClient httpClient) {
+        StepVerifier.create(
+                this.getClientWithConnectionString(httpClient, "listAvailableTollFreeAreaCodes")
+                        .listAvailableTollFreeAreaCodes("XX", PhoneNumberAssignmentType.APPLICATION).next())
+                .expectError();
+    }
+
+    @ParameterizedTest
+	public void getGeographicAreaCodes(HttpClient httpClient) {
+                        .next())
                 .assertNext((PhoneNumberAreaCode areaCodes) -> {
+                    assertNotNull(areaCodes);
                     assertNotNull(areaCodes.getAreaCode());
                 })
                 .verifyComplete();
     }
 
     @ParameterizedTest
     @MethodSource("com.azure.core.test.TestBase#getHttpClients")
-    public void getGeographicAreaCodes(HttpClient httpClient) {
-        PhoneNumberLocality locality = this.getClientWithConnectionString(httpClient, "listAvailableLocalities")
-                .listAvailableLocalities("US", null).blockFirst();
+    public void getGeographicAreaCodesWronglocality(HttpClient httpClient) {
         StepVerifier.create(
                 this.getClientWithConnectionString(httpClient, "listAvailableGeographicAreaCodes")
                         .listAvailableGeographicAreaCodes("US", PhoneNumberAssignmentType.PERSON,
-                                locality.getLocalizedName(), locality.getAdministrativeDivision().getAbbreviatedName())
+                                "XX", "XX")
                         .next())
-                .assertNext((PhoneNumberAreaCode areaCodes) -> {
-                    assertNotNull(areaCodes);
-                })
-                .verifyComplete();
+                .expectError();
     }
 
     @ParameterizedTest
@@ -391,19 +404,30 @@ 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();
+        PhoneNumberAdministrativeDivision localityAdministraiveDivision = this.getClientWithConnectionString(httpClient, "listAvailableLocalities")
+                .listAvailableLocalities("US", null).blockFirst().getAdministrativeDivision();
         StepVerifier.create(
                 this.getClientWithConnectionString(httpClient, "listAvailableLocalities")
-                        .listAvailableLocalities("US", localityAdministraiveDivision).next())
+                        .listAvailableLocalities("US", localityAdministraiveDivision.getAbbreviatedName()).next())
                 .assertNext((PhoneNumberLocality locality) -> {
                     assertNotNull(locality);
                     assertEquals(locality.getAdministrativeDivision().getAbbreviatedName(),
-                            localityAdministraiveDivision);
+                            localityAdministraiveDivision.getAbbreviatedName());
+                    assertEquals(locality.getAdministrativeDivision().getLocalizedName(),
+                            localityAdministraiveDivision.getLocalizedName());
                 })
                 .verifyComplete();
     }
 
+    @ParameterizedTest
+    @MethodSource("com.azure.core.test.TestBase#getHttpClients")
+    public void getLocalitiesInvalidAdministrativeDivision(HttpClient httpClient) {
+        StepVerifier.create(
+                this.getClientWithConnectionString(httpClient, "listAvailableLocalities")
+                        .listAvailableLocalities("US", "null").next())
+                .expectError();
+    }
+
     @ParameterizedTest
     @MethodSource("com.azure.core.test.TestBase#getHttpClients")
     public void getOfferings(HttpClient httpClient) {
@@ -412,6 +436,10 @@ public void getOfferings(HttpClient httpClient) {
                         .listAvailableOfferings("US", null, null).next())
                 .assertNext((PhoneNumberOffering offering) -> {
                     assertNotNull(offering);
+                    offering.getCost().getBillingFrequency();
+                    assertNotNull(BillingFrequency.values());
+                    assertNotNull(offering.getCost().getCurrencyCode());
+                    assertNotNull(offering.getCost().getAmount());
                 })
                 .verifyComplete();
     }

sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersClientIntegrationTest.java

@@ -217,6 +217,20 @@ public void getTollFreeAreaCodesWrongCountryCode(HttpClient httpClient) {
                 "Unable to parse country code.");
     }
 
+    @ParameterizedTest
+    @MethodSource("com.azure.core.test.TestBase#getHttpClients")
+    public void getGeographicAreaCodesWithoutContext(HttpClient httpClient) {
+        PhoneNumberLocality locality = this.getClientWithConnectionString(httpClient, "listAvailableLocalities")
+                .listAvailableLocalities("US", null).iterator().next();
+        PagedIterable<PhoneNumberAreaCode> areaCodesResult = this
+                .getClientWithConnectionString(httpClient, "listAvailableGeographicAreaCodes")
+                .listAvailableGeographicAreaCodes("US", PhoneNumberAssignmentType.PERSON, locality.getLocalizedName(),
+                        locality.getAdministrativeDivision().getAbbreviatedName());
+        PhoneNumberAreaCode areaCodes = areaCodesResult.iterator().next();
+        assertNotNull(areaCodes);
+        assertNotNull(areaCodes.getAreaCode());
+    }
+
     @ParameterizedTest
     @MethodSource("com.azure.core.test.TestBase#getHttpClients")
     public void getGeographicAreaCodes(HttpClient httpClient) {
@@ -270,7 +284,7 @@ public void getCountries(HttpClient httpClient) {
     public void getLocalitiesWithoutContext(HttpClient httpClient) {
         PagedIterable<PhoneNumberLocality> localitiesResult = this
                 .getClientWithConnectionString(httpClient, "listAvailableLocalities")
-                .listAvailableLocalities("US", null, Context.NONE);
+                .listAvailableLocalities("US", null);
         PhoneNumberLocality locality = localitiesResult.iterator().next();
         assertNotNull(locality);
     }
@@ -280,7 +294,7 @@ public void getLocalitiesWithoutContext(HttpClient httpClient) {
     public void getLocalities(HttpClient httpClient) {
         PagedIterable<PhoneNumberLocality> localitiesResult = this
                 .getClientWithConnectionString(httpClient, "listAvailableLocalities")
-                .listAvailableLocalities("US", null);
+                .listAvailableLocalities("US", null, Context.NONE);
         PhoneNumberLocality locality = localitiesResult.iterator().next();
         assertNotNull(locality);
     }
@@ -328,7 +342,10 @@ public void getOfferings(HttpClient httpClient) {
         PhoneNumberOffering offering = offeringsResult.iterator().next();
         assertNotNull(offering);
     }
-	@@ -353,11 +252,8 @@ public void getTollFreeAreaCodesWithAAD(HttpClient httpClient) {
+
+    @ParameterizedTest
+    @MethodSource("com.azure.core.test.TestBase#getHttpClients")
+    public void getTollFreeAreaCodesWithAAD(HttpClient httpClient) {
         PagedIterable<PhoneNumberAreaCode> areaCodesResult = this
                 .getClientWithManagedIdentity(httpClient, "listAvailableTollFreeAreaCodes")
                 .listAvailableTollFreeAreaCodes("US");
@@ -340,15 +357,23 @@ public void getOfferings(HttpClient httpClient) {
     }
 
     @ParameterizedTest
-	@@ -371,7 +267,6 @@ public void getGeographicAreaCodesWithAAD(HttpClient httpClient) {
+    @MethodSource("com.azure.core.test.TestBase#getHttpClients")
+    public void getGeographicAreaCodesWithAAD(HttpClient httpClient) {
+        PhoneNumberLocality locality = this.getClientWithConnectionString(httpClient, "listAvailableLocalities")
+                .listAvailableLocalities("US", null).iterator().next();
+        PagedIterable<PhoneNumberAreaCode> areaCodesResult = this
+                .getClientWithManagedIdentity(httpClient, "listAvailableGeographicAreaCodes")
+                .listAvailableGeographicAreaCodes("US", PhoneNumberAssignmentType.PERSON, locality.getLocalizedName(),
                         locality.getAdministrativeDivision().getAbbreviatedName());
         PhoneNumberAreaCode areaCodes = areaCodesResult.iterator().next();
         assertNotNull(areaCodes);
         assertNotNull(areaCodes.getAreaCode());
     }
 
     @ParameterizedTest
-	@@ -381,8 +276,6 @@ public void getCountriesWithAAD(HttpClient httpClient) {
+    @MethodSource("com.azure.core.test.TestBase#getHttpClients")
+    public void getCountriesWithAAD(HttpClient httpClient) {
+        PagedIterable<PhoneNumberCountry> countriesResult = this
                 .getClientWithManagedIdentity(httpClient, "listAvailableCountries").listAvailableCountries();
         PhoneNumberCountry country = countriesResult.iterator().next();
         assertNotNull(country);
@@ -357,7 +382,26 @@ public void getOfferings(HttpClient httpClient) {
     }
 
     @ParameterizedTest
-	@@ -409,7 +302,6 @@ public void getLocalitiesWithAdministrativeDivisionWithAAD(HttpClient httpClient
+    @MethodSource("com.azure.core.test.TestBase#getHttpClients")
+    public void getLocalitiesWithAAD(HttpClient httpClient) {
+        PagedIterable<PhoneNumberLocality> 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<PhoneNumberLocality> localities = this
+                .getClientWithManagedIdentity(httpClient, "listAvailableLocalities")
+                .listAvailableLocalities("US", null);
+        PhoneNumberLocality localityWithAD = localities.iterator().next();
+
+        PagedIterable<PhoneNumberLocality> localitiesResult = this
+                .getClientWithManagedIdentity(httpClient, "listAvailableLocalities")
+                .listAvailableLocalities("US", localityWithAD.getAdministrativeDivision().getAbbreviatedName());
         PhoneNumberLocality locality = localitiesResult.iterator().next();
         assertNotNull(locality);
         assertEquals(locality.getAdministrativeDivision().getAbbreviatedName(), localityWithAD.getAdministrativeDivision().getAbbreviatedName());

sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersIntegrationTestBase.java

@@ -54,7 +54,6 @@ protected PhoneNumbersClientBuilder getClientBuilderWithConnectionString(HttpCli
     private void addTestProxyMatchers() {
         interceptorManager.addMatchers(Arrays.asList(
             new CustomMatcher().setHeadersKeyOnlyMatch(Arrays.asList("x-ms-hmac-string-to-sign-base64"))));
-
     }
 
     private void addTestProxySanitizer() {