diff --git a/sdk/appconfiguration/azure-data-appconfiguration/src/test/java/com/azure/data/appconfiguration/ConfigurationClientTest.java b/sdk/appconfiguration/azure-data-appconfiguration/src/test/java/com/azure/data/appconfiguration/ConfigurationClientTest.java index 3d0c3e5a491e..744dddcf1bee 100644 --- a/sdk/appconfiguration/azure-data-appconfiguration/src/test/java/com/azure/data/appconfiguration/ConfigurationClientTest.java +++ b/sdk/appconfiguration/azure-data-appconfiguration/src/test/java/com/azure/data/appconfiguration/ConfigurationClientTest.java @@ -777,15 +777,11 @@ public void listConfigurationSettingsAcceptDateTime(HttpClient httpClient, Confi final ConfigurationSetting updated2 = new ConfigurationSetting().setKey(original.getKey()).setValue("anotherValue2"); // Create 3 revisions of the same key. - try { - assertConfigurationEquals(original, client.setConfigurationSettingWithResponse(original, false, Context.NONE).getValue()); - Thread.sleep(2000); - assertConfigurationEquals(updated, client.setConfigurationSettingWithResponse(updated, false, Context.NONE).getValue()); - Thread.sleep(2000); - assertConfigurationEquals(updated2, client.setConfigurationSettingWithResponse(updated2, false, Context.NONE).getValue()); - } catch (InterruptedException ex) { - // Do nothing. - } + assertConfigurationEquals(original, client.setConfigurationSettingWithResponse(original, false, Context.NONE).getValue()); + sleepIfRunningAgainstService(2000); + assertConfigurationEquals(updated, client.setConfigurationSettingWithResponse(updated, false, Context.NONE).getValue()); + sleepIfRunningAgainstService(2000); + assertConfigurationEquals(updated2, client.setConfigurationSettingWithResponse(updated2, false, Context.NONE).getValue()); // Gets all versions of this value so we can get the one we want at that particular date. List revisions = client.listRevisions(new SettingSelector().setKeyFilter(keyName)).stream().collect(Collectors.toList()); @@ -886,15 +882,11 @@ public void listRevisionsAcceptDateTime(HttpClient httpClient, ConfigurationServ final ConfigurationSetting updated2 = new ConfigurationSetting().setKey(original.getKey()).setValue("anotherValue2"); // Create 3 revisions of the same key. - try { - assertConfigurationEquals(original, client.setConfigurationSettingWithResponse(original, false, Context.NONE).getValue()); - Thread.sleep(2000); - assertConfigurationEquals(updated, client.setConfigurationSettingWithResponse(updated, false, Context.NONE).getValue()); - Thread.sleep(2000); - assertConfigurationEquals(updated2, client.setConfigurationSettingWithResponse(updated2, false, Context.NONE).getValue()); - } catch (InterruptedException ex) { - // Do nothing. - } + assertConfigurationEquals(original, client.setConfigurationSettingWithResponse(original, false, Context.NONE).getValue()); + sleepIfRunningAgainstService(2000); + assertConfigurationEquals(updated, client.setConfigurationSettingWithResponse(updated, false, Context.NONE).getValue()); + sleepIfRunningAgainstService(2000); + assertConfigurationEquals(updated2, client.setConfigurationSettingWithResponse(updated2, false, Context.NONE).getValue()); // Gets all versions of this value. List revisions = client.listRevisions(new SettingSelector().setKeyFilter(keyName)).stream().collect(Collectors.toList()); diff --git a/sdk/attestation/azure-security-attestation/src/test/java/com/azure/security/attestation/AttestationTest.java b/sdk/attestation/azure-security-attestation/src/test/java/com/azure/security/attestation/AttestationTest.java index 21c89af0fc57..0dada17dbdf1 100644 --- a/sdk/attestation/azure-security-attestation/src/test/java/com/azure/security/attestation/AttestationTest.java +++ b/sdk/attestation/azure-security-attestation/src/test/java/com/azure/security/attestation/AttestationTest.java @@ -9,6 +9,7 @@ import com.azure.core.test.utils.TestUtils; import com.azure.core.util.BinaryData; import com.azure.core.util.Context; +import com.azure.core.util.logging.LogLevel; import com.azure.core.util.serializer.SerializerEncoding; import com.azure.security.attestation.models.AttestationData; import com.azure.security.attestation.models.AttestationDataInterpretation; @@ -354,7 +355,8 @@ void testTpmAttestation(HttpClient httpClient, String clientUri) { .setAttestationSigner(new AttestationSigningKey(getIsolatedSigningCertificate(), getIsolatedSigningKey()))); if (result.getPolicyResolution() != PolicyModification.UPDATED) { - System.out.printf("Unexpected resolution setting TPM policy: %s", result.getPolicyResolution().toString()); + LOGGER.log(LogLevel.VERBOSE, + () -> "Unexpected resolution setting TPM policy: " + result.getPolicyResolution()); return; } @@ -373,11 +375,11 @@ void testTpmAttestation(HttpClient httpClient, String clientUri) { Object deserializedResponse = assertDoesNotThrow(() -> ADAPTER.deserialize(tpmResponse.getTpmResult().toBytes(), Object.class, SerializerEncoding.JSON)); - assertTrue(deserializedResponse instanceof LinkedHashMap); + assertInstanceOf(LinkedHashMap.class, deserializedResponse); @SuppressWarnings("unchecked") LinkedHashMap initialResponse = (LinkedHashMap) deserializedResponse; assertTrue(initialResponse.containsKey("payload")); - assertTrue(initialResponse.get("payload") instanceof LinkedHashMap); + assertInstanceOf(LinkedHashMap.class, initialResponse.get("payload")); @SuppressWarnings("unchecked") LinkedHashMap payload = (LinkedHashMap) initialResponse.get("payload"); assertTrue(payload.containsKey("challenge")); @@ -402,7 +404,8 @@ void testTpmAttestationWithResult(HttpClient httpClient, String clientUri) { .setAttestationSigner(new AttestationSigningKey(getIsolatedSigningCertificate(), getIsolatedSigningKey()))); if (result.getPolicyResolution() != PolicyModification.UPDATED) { - System.out.printf("Unexpected resolution setting TPM policy: %s", result.getPolicyResolution().toString()); + LOGGER.log(LogLevel.VERBOSE, + () -> "Unexpected resolution setting TPM policy: " + result.getPolicyResolution()); return; } @@ -423,11 +426,11 @@ void testTpmAttestationWithResult(HttpClient httpClient, String clientUri) { Object deserializedResponse = assertDoesNotThrow(() -> ADAPTER.deserialize( tpmResponse.getValue().getTpmResult().toBytes(), Object.class, SerializerEncoding.JSON)); - assertTrue(deserializedResponse instanceof LinkedHashMap); + assertInstanceOf(LinkedHashMap.class, deserializedResponse); @SuppressWarnings("unchecked") LinkedHashMap initialResponse = (LinkedHashMap) deserializedResponse; assertTrue(initialResponse.containsKey("payload")); - assertTrue(initialResponse.get("payload") instanceof LinkedHashMap); + assertInstanceOf(LinkedHashMap.class, initialResponse.get("payload")); @SuppressWarnings("unchecked") LinkedHashMap payload = (LinkedHashMap) initialResponse.get("payload"); assertTrue(payload.containsKey("challenge")); @@ -450,7 +453,8 @@ void testTpmAttestationAsync(HttpClient httpClient, String clientUri) { .setAttestationSigner(new AttestationSigningKey(getIsolatedSigningCertificate(), getIsolatedSigningKey()))); if (result.getPolicyResolution() != PolicyModification.UPDATED) { - System.out.printf("Unexpected resolution setting TPM policy: %s", result.getPolicyResolution().toString()); + LOGGER.log(LogLevel.VERBOSE, + () -> "Unexpected resolution setting TPM policy: " + result.getPolicyResolution()); return; } @@ -469,11 +473,11 @@ void testTpmAttestationAsync(HttpClient httpClient, String clientUri) { .assertNext(tpmResponse -> { Object deserializedResponse = assertDoesNotThrow(() -> ADAPTER.deserialize( tpmResponse.getTpmResult().toBytes(), Object.class, SerializerEncoding.JSON)); - assertTrue(deserializedResponse instanceof LinkedHashMap); + assertInstanceOf(LinkedHashMap.class, deserializedResponse); @SuppressWarnings("unchecked") LinkedHashMap initialResponse = (LinkedHashMap) deserializedResponse; assertTrue(initialResponse.containsKey("payload")); - assertTrue(initialResponse.get("payload") instanceof LinkedHashMap); + assertInstanceOf(LinkedHashMap.class, initialResponse.get("payload")); @SuppressWarnings("unchecked") LinkedHashMap payload = (LinkedHashMap) initialResponse.get("payload"); assertTrue(payload.containsKey("challenge")); @@ -669,7 +673,7 @@ private static void verifyAttestationResult(TestMode testMode, String clientUri, assertNull(result.getNonce()); if (expectJson) { - assertTrue(result.getRuntimeClaims() instanceof Map); + assertInstanceOf(Map.class, result.getRuntimeClaims()); @SuppressWarnings("unchecked") Map runtimeClaims = (Map) result.getRuntimeClaims(); Map expectedClaims = assertDoesNotThrow(() -> @@ -685,7 +689,7 @@ static void assertObjectEqual(Map expected, Map LOGGER.verbose("Key: " + key); assertTrue(actual.containsKey(key)); if (expected.get(key) instanceof Map) { - assertTrue(actual.get(key) instanceof Map); + assertInstanceOf(Map.class, actual.get(key)); @SuppressWarnings("unchecked") Map expectedInner = (Map) expected.get(key); @SuppressWarnings("unchecked") diff --git a/sdk/communication/azure-communication-callautomation/src/test/java/com/azure/communication/callautomation/CallAutomationAutomatedLiveTestBase.java b/sdk/communication/azure-communication-callautomation/src/test/java/com/azure/communication/callautomation/CallAutomationAutomatedLiveTestBase.java index 500d2108a25c..a7a831b0b173 100644 --- a/sdk/communication/azure-communication-callautomation/src/test/java/com/azure/communication/callautomation/CallAutomationAutomatedLiveTestBase.java +++ b/sdk/communication/azure-communication-callautomation/src/test/java/com/azure/communication/callautomation/CallAutomationAutomatedLiveTestBase.java @@ -8,28 +8,27 @@ import com.azure.communication.callautomation.models.events.CallAutomationEventBase; import com.azure.communication.common.CommunicationIdentifier; import com.azure.core.amqp.AmqpTransportType; +import com.azure.core.http.HttpClient; import com.azure.core.http.HttpMethod; import com.azure.core.http.HttpRequest; import com.azure.core.http.HttpResponse; import com.azure.core.test.TestMode; import com.azure.core.util.Configuration; +import com.azure.core.util.CoreUtils; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.messaging.servicebus.ServiceBusClientBuilder; import com.azure.messaging.servicebus.ServiceBusErrorContext; import com.azure.messaging.servicebus.ServiceBusException; import com.azure.messaging.servicebus.ServiceBusFailureReason; import com.azure.messaging.servicebus.ServiceBusProcessorClient; -import com.azure.core.http.HttpClient; import com.azure.messaging.servicebus.ServiceBusReceivedMessage; import com.azure.messaging.servicebus.ServiceBusReceivedMessageContext; +import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import com.azure.core.util.CoreUtils; -import java.util.StringJoiner; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; @@ -39,11 +38,15 @@ import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; +import java.util.StringJoiner; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; +import java.util.regex.Matcher; +import java.util.regex.Pattern; public class CallAutomationAutomatedLiveTestBase extends CallAutomationLiveTestBase { + private static final ClientLogger LOGGER = new ClientLogger(CallAutomationAutomatedLiveTestBase.class); + protected ConcurrentHashMap processorStore; // Key: callerId + receiverId, Value: incomingCallContext protected ConcurrentHashMap incomingCallContextStore; @@ -60,7 +63,7 @@ public class CallAutomationAutomatedLiveTestBase extends CallAutomationLiveTestB protected static final String BOT_APP_ID = Configuration.getGlobalConfiguration() .get("BOT_APP_ID", "REDACTED-bedb-REDACTED-b8c6-REDACTED"); - private static final StringJoiner JSON_PROPERTIES_TO_REDACT + private static final StringJoiner JSON_PROPERTIES_TO_REDACT = new StringJoiner("\":\"|\"", "\"", "\":\"") .add("value") .add("rawId") @@ -70,11 +73,11 @@ public class CallAutomationAutomatedLiveTestBase extends CallAutomationLiveTestB .add("ivrContext") .add("incomingCallContext") .add("serverCallId"); - + protected static final Pattern JSON_PROPERTY_VALUE_REDACTION_PATTERN = Pattern.compile(String.format("(?:%s)(.*?)(?:\",|\"})", JSON_PROPERTIES_TO_REDACT), Pattern.CASE_INSENSITIVE); - + protected static final String URL_REGEX = "(?<=http:\\/\\/|https:\\/\\/)([^\\/?]+)"; @Override @@ -206,11 +209,12 @@ private void messageBodyHandler(String body) { } protected void errorHandler(ServiceBusErrorContext context, CountDownLatch countdownLatch) { - System.out.printf("Error when receiving messages from namespace: '%s'. Entity: '%s'%n", - context.getFullyQualifiedNamespace(), context.getEntityPath()); + LOGGER.log(LogLevel.VERBOSE, () -> String.format( + "Error when receiving messages from namespace: '%s'. Entity: '%s'%n", + context.getFullyQualifiedNamespace(), context.getEntityPath())); if (!(context.getException() instanceof ServiceBusException)) { - System.out.printf("Non-ServiceBusException occurred: %s%n", context.getException()); + LOGGER.log(LogLevel.VERBOSE, () -> "Non-ServiceBusException occurred: " + context.getException()); return; } @@ -220,22 +224,20 @@ protected void errorHandler(ServiceBusErrorContext context, CountDownLatch count if (reason == ServiceBusFailureReason.MESSAGING_ENTITY_DISABLED || reason == ServiceBusFailureReason.MESSAGING_ENTITY_NOT_FOUND || reason == ServiceBusFailureReason.UNAUTHORIZED) { - System.out.printf("An unrecoverable error occurred. Stopping processing with reason %s: %s%n", - reason, exception.getMessage()); + LOGGER.log(LogLevel.VERBOSE, () -> String.format( + "An unrecoverable error occurred. Stopping processing with reason %s: %s%n", + reason, exception.getMessage())); countdownLatch.countDown(); } else if (reason == ServiceBusFailureReason.MESSAGE_LOCK_LOST) { - System.out.printf("Message lock lost for message: %s%n", context.getException()); + LOGGER.log(LogLevel.VERBOSE, + () -> String.format("Message lock lost for message: %s%n", context.getException())); } else if (reason == ServiceBusFailureReason.SERVICE_BUSY) { - try { - // Choosing an arbitrary amount of time to wait until trying again. - TimeUnit.SECONDS.sleep(1); - } catch (InterruptedException e) { - System.err.println("Unable to sleep for period of time"); - } + // Choosing an arbitrary amount of time to wait until trying again. + sleepIfRunningAgainstService(1000); } else { - System.out.printf("Error source %s, reason %s, message: %s%n", context.getErrorSource(), - reason, context.getException()); + LOGGER.log(LogLevel.VERBOSE, () -> String.format("Error source %s, reason %s, message: %s%n", + context.getErrorSource(), reason, context.getException())); } } @@ -260,7 +262,7 @@ protected String waitForIncomingCallContext(String uniqueId, Duration timeOut) t if (incomingCallContext != null) { return incomingCallContext; } - Thread.sleep(1000); + sleepIfRunningAgainstService(1000); } return null; } @@ -275,11 +277,11 @@ protected T waitForEvent(Class eventType, return event; } } - Thread.sleep(1000); + sleepIfRunningAgainstService(1000); } return null; } - + protected String redact(String content, Matcher matcher) { while (matcher.find()) { String captureGroup = matcher.group(1); diff --git a/sdk/communication/azure-communication-callautomation/src/test/java/com/azure/communication/callautomation/CallAutomationLiveTestBase.java b/sdk/communication/azure-communication-callautomation/src/test/java/com/azure/communication/callautomation/CallAutomationLiveTestBase.java index fbd9a81bd697..ca45f40b8eba 100644 --- a/sdk/communication/azure-communication-callautomation/src/test/java/com/azure/communication/callautomation/CallAutomationLiveTestBase.java +++ b/sdk/communication/azure-communication-callautomation/src/test/java/com/azure/communication/callautomation/CallAutomationLiveTestBase.java @@ -62,17 +62,17 @@ public class CallAutomationLiveTestBase extends TestProxyTestBase { protected static final String MEDIA_SOURCE = Configuration.getGlobalConfiguration() .get("ACS_MEDIA_SOURCE", "https://contoso.com/music.wav"); protected static final String URL_REGEX = "(?<=http:\\/\\/|https:\\/\\/)([^\\/?]+)"; - + protected CommunicationIdentityClientBuilder getCommunicationIdentityClientUsingConnectionString(HttpClient httpClient) { CommunicationIdentityClientBuilder builder = new CommunicationIdentityClientBuilder() .connectionString(CONNECTION_STRING) .httpClient(getHttpClientOrUsePlayback(httpClient)); - + if (getTestMode() == TestMode.RECORD) { builder.addPolicy(interceptorManager.getRecordPolicy()); } addTestProxyTestSanitizersAndMatchers(interceptorManager); - + return builder; } @@ -88,12 +88,12 @@ protected CallAutomationClientBuilder getCallAutomationClientUsingConnectionStri .connectionString(CONNECTION_STRING) .httpClient(getHttpClientOrUsePlayback(httpClient)); } - + if (getTestMode() == TestMode.RECORD) { builder.addPolicy(interceptorManager.getRecordPolicy()); } addTestProxyTestSanitizersAndMatchers(interceptorManager); - + return builder; } @@ -137,12 +137,6 @@ protected Mono logHeaders(String testName, HttpPipelineNextPolicy }); } - protected void waitForOperationCompletion(int milliSeconds) throws InterruptedException { - if (getTestMode() != TestMode.PLAYBACK) { - Thread.sleep(milliSeconds); - } - } - static class FakeCredentials implements TokenCredential { @Override public Mono getToken(TokenRequestContext tokenRequestContext) { @@ -159,15 +153,15 @@ protected String redact(String content, Matcher matcher) { } return content; } - + protected void addTestProxyTestSanitizersAndMatchers(InterceptorManager interceptorManager) { - + if (interceptorManager.isLiveMode()) { return; } List customSanitizers = new ArrayList<>(); - + customSanitizers.add(new TestProxySanitizer("Authorization", null, "REDACTED", TestProxySanitizerType.HEADER)); customSanitizers.add(new TestProxySanitizer("x-ms-client-request-id", null, "REDACTED", TestProxySanitizerType.HEADER)); customSanitizers.add(new TestProxySanitizer("x-ms-content-sha256", null, "REDACTED", TestProxySanitizerType.HEADER)); @@ -187,7 +181,7 @@ protected void addTestProxyTestSanitizersAndMatchers(InterceptorManager intercep customSanitizers.add(new TestProxySanitizer("$..mediaSubscriptionId", null, "REDACTED", TestProxySanitizerType.BODY_KEY)); customSanitizers.add(new TestProxySanitizer("$..dataSubscriptionId", null, "REDACTED", TestProxySanitizerType.BODY_KEY)); customSanitizers.add(new TestProxySanitizer(URL_REGEX, "REDACTED", TestProxySanitizerType.BODY_REGEX)); - + interceptorManager.addSanitizers(customSanitizers); if (interceptorManager.isPlaybackMode()) { diff --git a/sdk/communication/azure-communication-callautomation/src/test/java/com/azure/communication/callautomation/CallConnectionAsyncAutomatedLiveTests.java b/sdk/communication/azure-communication-callautomation/src/test/java/com/azure/communication/callautomation/CallConnectionAsyncAutomatedLiveTests.java index 58e33f437180..69662ce92337 100644 --- a/sdk/communication/azure-communication-callautomation/src/test/java/com/azure/communication/callautomation/CallConnectionAsyncAutomatedLiveTests.java +++ b/sdk/communication/azure-communication-callautomation/src/test/java/com/azure/communication/callautomation/CallConnectionAsyncAutomatedLiveTests.java @@ -15,15 +15,14 @@ import com.azure.communication.callautomation.models.RemoveParticipantResult; import com.azure.communication.callautomation.models.events.AddParticipantSucceeded; import com.azure.communication.callautomation.models.events.CallConnected; -import com.azure.communication.callautomation.models.events.RemoveParticipantSucceeded; import com.azure.communication.callautomation.models.events.CancelAddParticipantSucceeded; +import com.azure.communication.callautomation.models.events.RemoveParticipantSucceeded; import com.azure.communication.common.CommunicationIdentifier; import com.azure.communication.common.CommunicationUserIdentifier; import com.azure.communication.identity.CommunicationIdentityAsyncClient; import com.azure.core.http.HttpClient; import com.azure.core.http.rest.Response; import com.azure.core.test.annotation.DoNotRecord; - import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -235,7 +234,7 @@ public void createVOIPCallAndAnswerThenAddParticipantFinallyCancelAddParticipant assertNotNull(addParticipantsResultResponse); // ensure invitation is sent - Thread.sleep(3000); + sleepIfRunningAgainstService(3000); // cancel add participant CancelAddParticipantOperationResult cancelAddParticipantResponse = createCallResult diff --git a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallAutomationLiveTestBase.java b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallAutomationLiveTestBase.java index e5cf3dc2817e..fbfb3defe424 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallAutomationLiveTestBase.java +++ b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallAutomationLiveTestBase.java @@ -13,6 +13,8 @@ import com.azure.core.test.TestMode; import com.azure.core.util.Configuration; import com.azure.core.util.CoreUtils; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.identity.DefaultAzureCredentialBuilder; import reactor.core.publisher.Mono; @@ -25,6 +27,8 @@ import java.util.regex.Pattern; public class CallAutomationLiveTestBase extends TestBase { + private static final ClientLogger LOGGER = new ClientLogger(CallAutomationLiveTestBase.class); + protected static final String CONNECTION_STRING = Configuration.getGlobalConfiguration() .get("COMMUNICATION_LIVETEST_STATIC_CONNECTION_STRING", "endpoint=https://REDACTED.communication.azure.com/;accesskey=QWNjZXNzS2V5"); @@ -109,7 +113,7 @@ protected Mono logHeaders(String testName, HttpPipelineNextPolicy final HttpResponse bufferedResponse = httpResponse.buffer(); /* Should sanitize printed response url */ - System.out.println("Chain-ID header for " + testName + " request " + LOGGER.log(LogLevel.VERBOSE, () -> "Chain-ID header for " + testName + " request " + bufferedResponse.getRequest().getUrl() + ": " + bufferedResponse.getHeaderValue("X-Microsoft-Skype-Chain-ID")); return Mono.just(bufferedResponse); diff --git a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/DownloadContentAsyncLiveTests.java b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/DownloadContentAsyncLiveTests.java index 4a397fa5a51f..732a8df93167 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/DownloadContentAsyncLiveTests.java +++ b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/DownloadContentAsyncLiveTests.java @@ -8,6 +8,8 @@ import com.azure.communication.callingserver.models.ParallelDownloadOptions; import com.azure.core.http.HttpClient; import com.azure.core.util.Context; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -31,6 +33,7 @@ import static org.mockito.Mockito.times; public class DownloadContentAsyncLiveTests extends CallAutomationLiveTestBase { + private static final ClientLogger LOGGER = new ClientLogger(DownloadContentAsyncLiveTests.class); @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") @@ -61,7 +64,7 @@ private void downloadMetadata(CallAutomationAsyncClient conversationAsyncClient) try { validateMetadata(conversationAsyncClient.getCallRecordingAsync().downloadStream(METADATA_URL)); } catch (Exception e) { - System.out.println("Error: " + e.getMessage()); + LOGGER.log(LogLevel.VERBOSE, () -> "Error", e); throw e; } } @@ -79,7 +82,7 @@ public void downloadMetadataRetryingAsync(HttpClient httpClient) { try { validateMetadata(conversationAsyncClient.getCallRecordingAsync().downloadStream(METADATA_URL)); } catch (Exception e) { - System.out.println("Error: " + e.getMessage()); + LOGGER.log(LogLevel.VERBOSE, () -> "Error", e); throw e; } } @@ -104,7 +107,7 @@ public void downloadVideoAsync(HttpClient httpClient) { .verifyComplete()) .verifyComplete(); } catch (Exception e) { - System.out.println("Error: " + e.getMessage()); + LOGGER.log(LogLevel.VERBOSE, () -> "Error", e); throw e; } } diff --git a/sdk/communication/azure-communication-chat/src/test/java/com/azure/communication/chat/ChatClientTest.java b/sdk/communication/azure-communication-chat/src/test/java/com/azure/communication/chat/ChatClientTest.java index 89cd18a49ba8..4bdb19fff1e7 100644 --- a/sdk/communication/azure-communication-chat/src/test/java/com/azure/communication/chat/ChatClientTest.java +++ b/sdk/communication/azure-communication-chat/src/test/java/com/azure/communication/chat/ChatClientTest.java @@ -3,28 +3,30 @@ package com.azure.communication.chat; -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 org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.MethodSource; - +import com.azure.communication.chat.implementation.ChatOptionsProvider; +import com.azure.communication.chat.models.ChatThreadItem; +import com.azure.communication.chat.models.CreateChatThreadOptions; +import com.azure.communication.chat.models.CreateChatThreadResult; +import com.azure.communication.chat.models.ListChatThreadsOptions; +import com.azure.communication.common.CommunicationUserIdentifier; import com.azure.communication.identity.CommunicationIdentityClient; import com.azure.communication.identity.models.CommunicationTokenScope; -import com.azure.communication.common.CommunicationUserIdentifier; -import com.azure.communication.chat.implementation.ChatOptionsProvider; -import com.azure.communication.chat.models.*; import com.azure.core.credential.AccessToken; import com.azure.core.http.HttpClient; import com.azure.core.http.rest.PagedIterable; import com.azure.core.util.Context; import com.azure.core.util.logging.ClientLogger; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + /** * Set the AZURE_TEST_MODE environment variable to either PLAYBACK or RECORD to determine if tests are playback or * live. By default, tests are run in playback mode. @@ -129,7 +131,7 @@ public void canDeleteChatThreadWithResponse(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void canListChatThreads(HttpClient httpClient) throws InterruptedException { + public void canListChatThreads(HttpClient httpClient) { // Arrange setupTest(httpClient, "canListChatThreadsSync"); CreateChatThreadOptions threadRequest1 = ChatOptionsProvider.createThreadOptions( @@ -139,7 +141,7 @@ public void canListChatThreads(HttpClient httpClient) throws InterruptedExceptio client.createChatThread(threadRequest1); client.createChatThread(threadRequest2); - Thread.sleep(500); + sleepIfRunningAgainstService(500); // Action & Assert PagedIterable threadsResponse = client.listChatThreads(); @@ -156,7 +158,7 @@ public void canListChatThreads(HttpClient httpClient) throws InterruptedExceptio @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") - public void canListChatThreadsWithMaxPageSize(HttpClient httpClient) throws InterruptedException { + public void canListChatThreadsWithMaxPageSize(HttpClient httpClient) { // Arrange setupTest(httpClient, "canListChatThreadsWithMaxPageSizeSync"); CreateChatThreadOptions threadRequest1 = ChatOptionsProvider.createThreadOptions( @@ -166,7 +168,7 @@ public void canListChatThreadsWithMaxPageSize(HttpClient httpClient) throws Inte client.createChatThread(threadRequest1); client.createChatThread(threadRequest2); - Thread.sleep(500); + sleepIfRunningAgainstService(500); ListChatThreadsOptions options = new ListChatThreadsOptions(); options.setMaxPageSize(10); diff --git a/sdk/communication/azure-communication-chat/src/test/java/com/azure/communication/chat/CommunicationLoggerPolicy.java b/sdk/communication/azure-communication-chat/src/test/java/com/azure/communication/chat/CommunicationLoggerPolicy.java index 362f2f720f74..74737342374d 100644 --- a/sdk/communication/azure-communication-chat/src/test/java/com/azure/communication/chat/CommunicationLoggerPolicy.java +++ b/sdk/communication/azure-communication-chat/src/test/java/com/azure/communication/chat/CommunicationLoggerPolicy.java @@ -9,6 +9,7 @@ import com.azure.core.http.policy.HttpPipelinePolicy; import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import reactor.core.publisher.Mono; /** @@ -16,7 +17,7 @@ */ public class CommunicationLoggerPolicy implements HttpPipelinePolicy { - private final ClientLogger logger = new ClientLogger(CommunicationLoggerPolicy.class); + private static final ClientLogger LOGGER = new ClientLogger(CommunicationLoggerPolicy.class); private final String testName; /** @@ -34,7 +35,7 @@ public Mono process(HttpPipelineCallContext context, HttpPipelineN final HttpResponse bufferedResponse = httpResponse.buffer(); // Should sanitize printed reponse url - System.out.println("MS-CV header for " + testName + " request " + LOGGER.log(LogLevel.VERBOSE, () -> "MS-CV header for " + testName + " request " + bufferedResponse.getRequest().getUrl() + ": " + bufferedResponse.getHeaderValue("MS-CV")); return Mono.just(bufferedResponse); }); diff --git a/sdk/communication/azure-communication-identity/src/test/java/com/azure/communication/identity/CommunicationIdentityClientTestBase.java b/sdk/communication/azure-communication-identity/src/test/java/com/azure/communication/identity/CommunicationIdentityClientTestBase.java index 4a2be505d72a..0b183b1b4d6a 100644 --- a/sdk/communication/azure-communication-identity/src/test/java/com/azure/communication/identity/CommunicationIdentityClientTestBase.java +++ b/sdk/communication/azure-communication-identity/src/test/java/com/azure/communication/identity/CommunicationIdentityClientTestBase.java @@ -19,6 +19,8 @@ import com.azure.core.test.models.TestProxySanitizerType; import com.azure.core.test.utils.MockTokenCredential; import com.azure.core.util.Configuration; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.identity.DefaultAzureCredentialBuilder; import reactor.core.publisher.Mono; @@ -33,6 +35,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; public class CommunicationIdentityClientTestBase extends TestProxyTestBase { + private static final ClientLogger LOGGER = new ClientLogger(CommunicationIdentityClientTestBase.class); private static final String REDACTED = "REDACTED"; private static final String URI_IDENTITY_REPLACER_REGEX = "/identities/([^/?]+)"; @@ -159,7 +162,7 @@ private Mono logHeaders(String testName, HttpPipelineNextPolicy ne final HttpResponse bufferedResponse = httpResponse.buffer(); // Should sanitize printed reponse url - System.out.println("MS-CV header for " + testName + " request " + LOGGER.log(LogLevel.VERBOSE, () -> "MS-CV header for " + testName + " request " + bufferedResponse.getRequest().getUrl() + ": " + bufferedResponse.getHeaderValue("MS-CV")); return Mono.just(bufferedResponse); }); diff --git a/sdk/communication/azure-communication-jobrouter/src/test/java/com.azure.communication.jobrouter/ClassificationPolicyAsyncLiveTests.java b/sdk/communication/azure-communication-jobrouter/src/test/java/com.azure.communication.jobrouter/ClassificationPolicyAsyncLiveTests.java index b180abf99367..deac224f7551 100644 --- a/sdk/communication/azure-communication-jobrouter/src/test/java/com.azure.communication.jobrouter/ClassificationPolicyAsyncLiveTests.java +++ b/sdk/communication/azure-communication-jobrouter/src/test/java/com.azure.communication.jobrouter/ClassificationPolicyAsyncLiveTests.java @@ -26,7 +26,6 @@ import com.azure.communication.jobrouter.models.WorkerSelectorAttachment; import com.azure.core.http.HttpClient; import com.azure.core.http.rest.Response; -import com.azure.core.test.TestMode; import com.azure.core.util.BinaryData; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -139,9 +138,7 @@ public void createClassificationPolicy(HttpClient httpClient) throws Interrupted } })).block(); - if (this.getTestMode() != TestMode.PLAYBACK) { - Thread.sleep(5000); - } + sleepIfRunningAgainstService(5000); // Verify assertEquals(classificationPolicyId, policy.getId()); diff --git a/sdk/communication/azure-communication-jobrouter/src/test/java/com.azure.communication.jobrouter/ClassificationPolicyLiveTests.java b/sdk/communication/azure-communication-jobrouter/src/test/java/com.azure.communication.jobrouter/ClassificationPolicyLiveTests.java index 5639631436e9..1da46b2b40da 100644 --- a/sdk/communication/azure-communication-jobrouter/src/test/java/com.azure.communication.jobrouter/ClassificationPolicyLiveTests.java +++ b/sdk/communication/azure-communication-jobrouter/src/test/java/com.azure.communication.jobrouter/ClassificationPolicyLiveTests.java @@ -24,7 +24,6 @@ import com.azure.communication.jobrouter.models.WorkerSelectorAttachment; import com.azure.core.http.HttpClient; import com.azure.core.http.rest.Response; -import com.azure.core.test.TestMode; import com.azure.core.util.BinaryData; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -107,9 +106,7 @@ public void createClassificationPolicy(HttpClient httpClient) throws Interrupted RouterJob job = routerClient.createJobWithClassificationPolicy( new CreateJobWithClassificationPolicyOptions(jobId, channelId, classificationPolicyId)); - if (this.getTestMode() != TestMode.PLAYBACK) { - Thread.sleep(5000); - } + sleepIfRunningAgainstService(5000); // Verify assertEquals(classificationPolicyId, policy.getId()); diff --git a/sdk/communication/azure-communication-jobrouter/src/test/java/com.azure.communication.jobrouter/RouterJobAsyncLiveTests.java b/sdk/communication/azure-communication-jobrouter/src/test/java/com.azure.communication.jobrouter/RouterJobAsyncLiveTests.java index 92e21536b168..ccf6b55c2157 100644 --- a/sdk/communication/azure-communication-jobrouter/src/test/java/com.azure.communication.jobrouter/RouterJobAsyncLiveTests.java +++ b/sdk/communication/azure-communication-jobrouter/src/test/java/com.azure.communication.jobrouter/RouterJobAsyncLiveTests.java @@ -25,7 +25,6 @@ import com.azure.core.http.HttpClient; import com.azure.core.http.rest.RequestOptions; import com.azure.core.http.rest.Response; -import com.azure.core.test.TestMode; import com.azure.core.util.BinaryData; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -150,9 +149,7 @@ public void unassignJob(HttpClient httpClient) throws InterruptedException { assertEquals(2, jobDeserialized.getRequestedWorkerSelectors().size()); assertEquals(Duration.ofSeconds(100), jobDeserialized.getRequestedWorkerSelectors().get(0).getExpiresAfter()); - if (this.getTestMode() != TestMode.PLAYBACK) { - Thread.sleep(2000); - } + sleepIfRunningAgainstService(2000); jobDeserialized.setPriority(10); RouterJob updatedJob = jobRouterAsyncClient.updateJob(jobId, jobDeserialized).block(); @@ -207,9 +204,7 @@ public void unassignJob(HttpClient httpClient) throws InterruptedException { // Verify assertTrue(unassignJobResult.getUnassignmentCount() > 0); - if (this.getTestMode() != TestMode.PLAYBACK) { - Thread.sleep(5000); - } + sleepIfRunningAgainstService(5000); RouterQueueStatistics queueStatistics = jobRouterAsyncClient.getQueueStatistics(queueId).block(); @@ -236,9 +231,7 @@ public void unassignJob(HttpClient httpClient) throws InterruptedException { jobRouterAsyncClient.cancelJob(jobId, requestOptions).block(); jobRouterAsyncClient.deleteJob(jobId).block(); jobRouterAsyncClient.deleteWorker(workerId).block(); - if (this.getTestMode() != TestMode.PLAYBACK) { - Thread.sleep(5000); - } + sleepIfRunningAgainstService(5000); administrationAsyncClient.deleteQueue(queueId).block(); administrationAsyncClient.deleteDistributionPolicy(distributionPolicyId).block(); } diff --git a/sdk/communication/azure-communication-jobrouter/src/test/java/com.azure.communication.jobrouter/RouterJobLiveTests.java b/sdk/communication/azure-communication-jobrouter/src/test/java/com.azure.communication.jobrouter/RouterJobLiveTests.java index 23447f8edab1..2363a4d1228a 100644 --- a/sdk/communication/azure-communication-jobrouter/src/test/java/com.azure.communication.jobrouter/RouterJobLiveTests.java +++ b/sdk/communication/azure-communication-jobrouter/src/test/java/com.azure.communication.jobrouter/RouterJobLiveTests.java @@ -25,7 +25,6 @@ import com.azure.core.http.HttpClient; import com.azure.core.http.rest.RequestOptions; import com.azure.core.http.rest.Response; -import com.azure.core.test.TestMode; import com.azure.core.util.BinaryData; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -151,9 +150,7 @@ public void unassignJob(HttpClient httpClient) throws InterruptedException { assertEquals(2, jobDeserialized.getRequestedWorkerSelectors().size()); assertEquals(Duration.ofSeconds(100), jobDeserialized.getRequestedWorkerSelectors().get(0).getExpiresAfter()); - if (this.getTestMode() != TestMode.PLAYBACK) { - Thread.sleep(2000); - } + sleepIfRunningAgainstService(2000); jobDeserialized.setPriority(10); RouterJob updatedJob = jobRouterClient.updateJob(jobId, jobDeserialized); @@ -207,9 +204,7 @@ public void unassignJob(HttpClient httpClient) throws InterruptedException { // Verify assertTrue(unassignJobResult.getUnassignmentCount() > 0); - if (this.getTestMode() != TestMode.PLAYBACK) { - Thread.sleep(5000); - } + sleepIfRunningAgainstService(5000); RouterQueueStatistics queueStatistics = jobRouterClient.getQueueStatistics(queueId); @@ -235,9 +230,7 @@ public void unassignJob(HttpClient httpClient) throws InterruptedException { jobRouterClient.cancelJob(jobId, requestOptions); jobRouterClient.deleteJob(jobId); jobRouterClient.deleteWorker(workerId); - if (this.getTestMode() != TestMode.PLAYBACK) { - Thread.sleep(5000); - } + sleepIfRunningAgainstService(5000); routerAdminClient.deleteQueue(queueId); routerAdminClient.deleteDistributionPolicy(distributionPolicyId); } @@ -264,9 +257,7 @@ public void jobScheduling(HttpClient httpClient) throws InterruptedException { OffsetDateTime.of(2040, 1, 1, 1, 1, 1, 1, ZoneOffset.UTC)))); assertEquals(RouterJobStatus.PENDING_SCHEDULE, job.getStatus()); - if (this.getTestMode() != TestMode.PLAYBACK) { - Thread.sleep(2000); - } + sleepIfRunningAgainstService(2000); // Action job.setMatchingMode(new QueueAndMatchMode()); diff --git a/sdk/communication/azure-communication-jobrouter/src/test/java/com.azure.communication.jobrouter/RouterWorkerAsyncLiveTests.java b/sdk/communication/azure-communication-jobrouter/src/test/java/com.azure.communication.jobrouter/RouterWorkerAsyncLiveTests.java index 800d9d47d2f1..4cd77b5ce427 100644 --- a/sdk/communication/azure-communication-jobrouter/src/test/java/com.azure.communication.jobrouter/RouterWorkerAsyncLiveTests.java +++ b/sdk/communication/azure-communication-jobrouter/src/test/java/com.azure.communication.jobrouter/RouterWorkerAsyncLiveTests.java @@ -14,7 +14,6 @@ import com.azure.communication.jobrouter.models.RouterWorker; import com.azure.core.http.HttpClient; import com.azure.core.http.rest.Response; -import com.azure.core.test.TestMode; import com.azure.core.util.BinaryData; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -132,9 +131,7 @@ public void createWorker(HttpClient httpClient) throws InterruptedException { assertEquals(channels.size(), deserialized.getChannels().size()); assertEquals(deserialized.getEtag(), result.getEtag()); - if (this.getTestMode() != TestMode.PLAYBACK) { - Thread.sleep(2000); - } + sleepIfRunningAgainstService(2000); deserialized.setAvailableForOffers(true); deserialized.setChannels(new ArrayList() { diff --git a/sdk/communication/azure-communication-jobrouter/src/test/java/com.azure.communication.jobrouter/RouterWorkerLiveTests.java b/sdk/communication/azure-communication-jobrouter/src/test/java/com.azure.communication.jobrouter/RouterWorkerLiveTests.java index 008f0b3a0eea..b4423b1403e9 100644 --- a/sdk/communication/azure-communication-jobrouter/src/test/java/com.azure.communication.jobrouter/RouterWorkerLiveTests.java +++ b/sdk/communication/azure-communication-jobrouter/src/test/java/com.azure.communication.jobrouter/RouterWorkerLiveTests.java @@ -11,7 +11,6 @@ import com.azure.communication.jobrouter.models.RouterWorker; import com.azure.core.http.HttpClient; import com.azure.core.http.rest.Response; -import com.azure.core.test.TestMode; import com.azure.core.util.BinaryData; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -108,9 +107,7 @@ public void createWorker(HttpClient httpClient) throws InterruptedException { assertEquals(channels.size(), deserialized.getChannels().size()); assertEquals(deserialized.getEtag(), result.getEtag()); - if (this.getTestMode() != TestMode.PLAYBACK) { - Thread.sleep(2000); - } + sleepIfRunningAgainstService(2000); deserialized.setAvailableForOffers(true); deserialized.setChannels(new ArrayList() { diff --git a/sdk/communication/azure-communication-messages/src/test/java/com/azure/communication/messages/CommunicationMessagesTestBase.java b/sdk/communication/azure-communication-messages/src/test/java/com/azure/communication/messages/CommunicationMessagesTestBase.java index 34bfb174ebde..ebb1ceae3992 100644 --- a/sdk/communication/azure-communication-messages/src/test/java/com/azure/communication/messages/CommunicationMessagesTestBase.java +++ b/sdk/communication/azure-communication-messages/src/test/java/com/azure/communication/messages/CommunicationMessagesTestBase.java @@ -14,11 +14,14 @@ import com.azure.core.test.models.TestProxySanitizer; import com.azure.core.test.models.TestProxySanitizerType; import com.azure.core.util.Configuration; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import reactor.core.publisher.Mono; import java.util.Arrays; public class CommunicationMessagesTestBase extends TestProxyTestBase { + private static final ClientLogger LOGGER = new ClientLogger(CommunicationMessagesTestBase.class); protected static final String CONNECTION_STRING = Configuration.getGlobalConfiguration() .get("COMMUNICATION_CONNECTION_STRING_CPM", @@ -101,7 +104,7 @@ public Mono logHeaders(HttpPipelineNextPolicy next) { final HttpResponse bufferedResponse = httpResponse.buffer(); // Should sanitize printed reponse url - System.out.println("MS-CV header for request " + LOGGER.log(LogLevel.VERBOSE, () -> "MS-CV header for request " + bufferedResponse.getRequest().getUrl() + ": " + bufferedResponse.getHeaderValue("MS-CV")); return Mono.just(bufferedResponse); }); diff --git a/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersIntegrationTestBase.java b/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersIntegrationTestBase.java index 43789327783c..15d95cadd7c3 100644 --- a/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersIntegrationTestBase.java +++ b/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/PhoneNumbersIntegrationTestBase.java @@ -16,12 +16,16 @@ import com.azure.core.test.models.TestProxySanitizerType; import com.azure.core.test.utils.MockTokenCredential; import com.azure.core.util.Configuration; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.identity.DefaultAzureCredentialBuilder; import reactor.core.publisher.Mono; import java.util.Arrays; public class PhoneNumbersIntegrationTestBase extends TestProxyTestBase { + private static final ClientLogger LOGGER = new ClientLogger(PhoneNumbersIntegrationTestBase.class); + private static final String CONNECTION_STRING = Configuration.getGlobalConfiguration() .get("COMMUNICATION_LIVETEST_STATIC_CONNECTION_STRING", "endpoint=https://REDACTED.communication.azure.com/;accesskey=QWNjZXNzS2V5"); @@ -141,8 +145,8 @@ private Mono logHeaders(String testName, HttpPipelineNextPolicy ne final HttpResponse bufferedResponse = httpResponse.buffer(); // Should sanitize printed reponse url - System.out.println("MS-CV header for " + testName + " request " - + bufferedResponse.getRequest().getUrl() + ": " + bufferedResponse.getHeaderValue("MS-CV")); + LOGGER.log(LogLevel.VERBOSE, () -> "MS-CV header for " + testName + " request " + + bufferedResponse.getRequest().getUrl() + ": " + bufferedResponse.getHeaderValue("MS-CV")); return Mono.just(bufferedResponse); }); } diff --git a/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/siprouting/SipRoutingIntegrationTestBase.java b/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/siprouting/SipRoutingIntegrationTestBase.java index b74c96e53805..8d0b33036d34 100644 --- a/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/siprouting/SipRoutingIntegrationTestBase.java +++ b/sdk/communication/azure-communication-phonenumbers/src/test/java/com/azure/communication/phonenumbers/siprouting/SipRoutingIntegrationTestBase.java @@ -19,16 +19,20 @@ import com.azure.core.test.models.TestProxySanitizerType; import com.azure.core.test.utils.MockTokenCredential; import com.azure.core.util.Configuration; +import com.azure.core.util.CoreUtils; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.identity.DefaultAzureCredentialBuilder; import reactor.core.publisher.Mono; import java.util.Arrays; import java.util.List; -import java.util.UUID; import static java.util.Arrays.asList; public class SipRoutingIntegrationTestBase extends TestProxyTestBase { + private static final ClientLogger LOGGER = new ClientLogger(SipRoutingIntegrationTestBase.class); + private static final String CONNECTION_STRING = Configuration.getGlobalConfiguration() .get("COMMUNICATION_LIVETEST_DYNAMIC_CONNECTION_STRING", "endpoint=https://REDACTED.communication.azure.com/;accesskey=QWNjZXNzS2V5"); private static final String AZURE_TEST_DOMAIN = Configuration.getGlobalConfiguration() @@ -192,7 +196,7 @@ private Mono logHeaders(String testName, HttpPipelineNextPolicy ne final HttpResponse bufferedResponse = httpResponse.buffer(); // Should sanitize printed reponse url - System.out.println("MS-CV header for " + testName + " request " + LOGGER.log(LogLevel.VERBOSE, () -> "MS-CV header for " + testName + " request " + bufferedResponse.getRequest().getUrl() + ": " + bufferedResponse.getHeaderValue("MS-CV")); return Mono.just(bufferedResponse); }); @@ -203,7 +207,7 @@ private static String getUniqueFqdn(String order) { return order + ".redacted" + "." + AZURE_TEST_DOMAIN; } - String unique = UUID.randomUUID().toString().replace("-", ""); + String unique = CoreUtils.randomUuid().toString().replace("-", ""); return order + "-" + unique + "." + AZURE_TEST_DOMAIN; } } diff --git a/sdk/communication/azure-communication-rooms/src/test/java/com/azure/communication/rooms/RoomsAsyncClientTests.java b/sdk/communication/azure-communication-rooms/src/test/java/com/azure/communication/rooms/RoomsAsyncClientTests.java index dc472774da6f..6fe6e520b73d 100644 --- a/sdk/communication/azure-communication-rooms/src/test/java/com/azure/communication/rooms/RoomsAsyncClientTests.java +++ b/sdk/communication/azure-communication-rooms/src/test/java/com/azure/communication/rooms/RoomsAsyncClientTests.java @@ -3,33 +3,42 @@ package com.azure.communication.rooms; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; - +import com.azure.communication.common.CommunicationIdentifier; +import com.azure.communication.common.CommunicationUserIdentifier; import com.azure.communication.identity.CommunicationIdentityClient; -import com.azure.communication.rooms.models.*; import com.azure.communication.rooms.implementation.models.CommunicationErrorResponseException; +import com.azure.communication.rooms.models.AddOrUpdateParticipantsResult; +import com.azure.communication.rooms.models.CommunicationRoom; +import com.azure.communication.rooms.models.CreateRoomOptions; +import com.azure.communication.rooms.models.ParticipantRole; +import com.azure.communication.rooms.models.RemoveParticipantsResult; +import com.azure.communication.rooms.models.RoomParticipant; +import com.azure.communication.rooms.models.UpdateRoomOptions; import com.azure.core.http.HttpClient; -import com.azure.core.http.rest.Response; -import com.azure.core.util.Context; import com.azure.core.http.rest.PagedFlux; +import com.azure.core.http.rest.Response; import com.azure.core.test.http.AssertingHttpClientBuilder; -import java.util.Arrays; -import java.util.List; - -import com.azure.communication.common.CommunicationIdentifier; -import com.azure.communication.common.CommunicationUserIdentifier; - +import com.azure.core.util.Context; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; - import reactor.core.publisher.Mono; import reactor.test.StepVerifier; +import java.util.Arrays; +import java.util.List; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class RoomsAsyncClientTests extends RoomsTestBase { + private static final ClientLogger LOGGER = new ClientLogger(RoomsAsyncClientTests.class); + private RoomsAsyncClient roomsAsyncClient; private CommunicationIdentityClient communicationClient; private final String nonExistRoomId = "NotExistingRoomID"; @@ -78,7 +87,7 @@ public void createRoomFullCycleWithResponseStep(HttpClient httpClient) { Mono> response3 = roomsAsyncClient.updateRoomWithResponse(roomId, updateOptions); - System.out.println(VALID_FROM.plusMonths(3).getDayOfYear()); + LOGGER.log(LogLevel.VERBOSE, () -> String.valueOf(VALID_FROM.plusMonths(3).getDayOfYear())); StepVerifier.create(response3) .assertNext(roomResult -> { @@ -121,10 +130,10 @@ public void createRoomFullCycleWithOutResponseStep(HttpClient httpClient) { StepVerifier.create(response1) .assertNext(roomResult -> { - assertTrue(roomResult.getRoomId() != null); - assertTrue(roomResult.getCreatedAt() != null); - assertTrue(roomResult.getValidFrom() != null); - assertTrue(roomResult.getValidUntil() != null); + assertNotNull(roomResult.getRoomId()); + assertNotNull(roomResult.getCreatedAt()); + assertNotNull(roomResult.getValidFrom()); + assertNotNull(roomResult.getValidUntil()); assertTrue(roomResult.isPstnDialOutEnabled()); }).verifyComplete(); @@ -139,7 +148,7 @@ public void createRoomFullCycleWithOutResponseStep(HttpClient httpClient) { StepVerifier.create(response3) .assertNext(result3 -> { - assertEquals(true, result3.getValidUntil().toEpochSecond() > result3.getValidFrom().toEpochSecond()); + assertTrue(result3.getValidUntil().toEpochSecond() > result3.getValidFrom().toEpochSecond()); assertTrue(result3.isPstnDialOutEnabled()); }).verifyComplete(); @@ -168,10 +177,10 @@ public void createRoomWithNoAttributes(HttpClient httpClient) { StepVerifier.create(response1) .assertNext(roomResult -> { - assertTrue(roomResult.getRoomId() != null); - assertTrue(roomResult.getCreatedAt() != null); - assertTrue(roomResult.getValidFrom() != null); - assertTrue(roomResult.getValidUntil() != null); + assertNotNull(roomResult.getRoomId()); + assertNotNull(roomResult.getCreatedAt()); + assertNotNull(roomResult.getValidFrom()); + assertNotNull(roomResult.getValidUntil()); assertFalse(roomResult.isPstnDialOutEnabled()); }).verifyComplete(); @@ -210,10 +219,10 @@ public void createRoomWithOnlyParticipantAttributes(HttpClient httpClient) { StepVerifier.create(response1) .assertNext(roomResult -> { - assertTrue(roomResult.getRoomId() != null); - assertTrue(roomResult.getCreatedAt() != null); - assertTrue(roomResult.getValidFrom() != null); - assertTrue(roomResult.getValidUntil() != null); + assertNotNull(roomResult.getRoomId()); + assertNotNull(roomResult.getCreatedAt()); + assertNotNull(roomResult.getValidFrom()); + assertNotNull(roomResult.getValidUntil()); assertTrue(roomResult.isPstnDialOutEnabled()); }).verifyComplete(); @@ -241,10 +250,10 @@ public void createRoomWithOnlyPstnEnabledAttribute(HttpClient httpClient) { StepVerifier.create(response1) .assertNext(roomResult -> { - assertTrue(roomResult.getRoomId() != null); - assertTrue(roomResult.getCreatedAt() != null); - assertTrue(roomResult.getValidFrom() != null); - assertTrue(roomResult.getValidUntil() != null); + assertNotNull(roomResult.getRoomId()); + assertNotNull(roomResult.getCreatedAt()); + assertNotNull(roomResult.getValidFrom()); + assertNotNull(roomResult.getValidUntil()); assertTrue(roomResult.isPstnDialOutEnabled()); }).verifyComplete(); @@ -566,10 +575,10 @@ public void addUpdateAndRemoveParticipantsOperationsWithFullFlow(HttpClient http StepVerifier.create(createCommunicationRoom) .assertNext(roomResult -> { - assertTrue(roomResult.getRoomId() != null); - assertTrue(roomResult.getCreatedAt() != null); - assertTrue(roomResult.getValidFrom() != null); - assertTrue(roomResult.getValidUntil() != null); + assertNotNull(roomResult.getRoomId()); + assertNotNull(roomResult.getCreatedAt()); + assertNotNull(roomResult.getValidFrom()); + assertNotNull(roomResult.getValidUntil()); assertTrue(roomResult.isPstnDialOutEnabled()); }).verifyComplete(); @@ -627,7 +636,7 @@ public void addUpdateAndRemoveParticipantsOperationsWithFullFlow(HttpClient http StepVerifier.create(updateParticipantResponse) .assertNext(result -> { - assertEquals(true, result instanceof AddOrUpdateParticipantsResult); + assertInstanceOf(AddOrUpdateParticipantsResult.class, result); }) .verifyComplete(); @@ -680,7 +689,7 @@ public void addUpdateAndRemoveParticipantsOperationsWithFullFlow(HttpClient http StepVerifier.create(removeParticipantResponse2) .assertNext(result -> { - assertEquals(true, result instanceof RemoveParticipantsResult); + assertInstanceOf(RemoveParticipantsResult.class, result); }) .verifyComplete(); @@ -716,10 +725,10 @@ public void addParticipantsOperationWithOutResponse(HttpClient httpClient) { StepVerifier.create(createCommunicationRoom) .assertNext(roomResult -> { - assertTrue(roomResult.getRoomId() != null); - assertTrue(roomResult.getCreatedAt() != null); - assertTrue(roomResult.getValidFrom() != null); - assertTrue(roomResult.getValidUntil() != null); + assertNotNull(roomResult.getRoomId()); + assertNotNull(roomResult.getCreatedAt()); + assertNotNull(roomResult.getValidFrom()); + assertNotNull(roomResult.getValidUntil()); assertTrue(roomResult.isPstnDialOutEnabled()); }).verifyComplete(); @@ -772,10 +781,10 @@ public void addUpdateInvalidParticipants(HttpClient httpClient) { StepVerifier.create(createCommunicationRoom) .assertNext(roomResult -> { - assertEquals(true, roomResult.getRoomId() != null); - assertEquals(true, roomResult.getCreatedAt() != null); - assertEquals(true, roomResult.getValidFrom() != null); - assertEquals(true, roomResult.getValidUntil() != null); + assertNotNull(roomResult.getRoomId()); + assertNotNull(roomResult.getCreatedAt()); + assertNotNull(roomResult.getValidFrom()); + assertNotNull(roomResult.getValidUntil()); }).verifyComplete(); String roomId = createCommunicationRoom.block().getRoomId(); @@ -822,10 +831,10 @@ public void listRoomTestFirstRoomIsNotNullThenDeleteRoomWithOutResponse(HttpClie StepVerifier.create(createCommunicationRoom) .assertNext(roomResult -> { - assertEquals(true, roomResult.getRoomId() != null); - assertEquals(true, roomResult.getCreatedAt() != null); - assertEquals(true, roomResult.getValidFrom() != null); - assertEquals(true, roomResult.getValidUntil() != null); + assertNotNull(roomResult.getRoomId()); + assertNotNull(roomResult.getCreatedAt()); + assertNotNull(roomResult.getValidFrom()); + assertNotNull(roomResult.getValidUntil()); }).verifyComplete(); String roomId = createCommunicationRoom.block().getRoomId(); @@ -835,10 +844,10 @@ public void listRoomTestFirstRoomIsNotNullThenDeleteRoomWithOutResponse(HttpClie StepVerifier.create(listRoomResponse.take(1)) .assertNext(room -> { - assertEquals(true, room.getRoomId() != null); - assertEquals(true, room.getCreatedAt() != null); - assertEquals(true, room.getValidFrom() != null); - assertEquals(true, room.getValidUntil() != null); + assertNotNull(room.getRoomId()); + assertNotNull(room.getCreatedAt()); + assertNotNull(room.getValidFrom()); + assertNotNull(room.getValidUntil()); }) .expectComplete() .verify(); diff --git a/sdk/communication/azure-communication-rooms/src/test/java/com/azure/communication/rooms/RoomsTestBase.java b/sdk/communication/azure-communication-rooms/src/test/java/com/azure/communication/rooms/RoomsTestBase.java index c78a43f7207b..d845723cd19b 100644 --- a/sdk/communication/azure-communication-rooms/src/test/java/com/azure/communication/rooms/RoomsTestBase.java +++ b/sdk/communication/azure-communication-rooms/src/test/java/com/azure/communication/rooms/RoomsTestBase.java @@ -5,10 +5,14 @@ import com.azure.communication.common.implementation.CommunicationConnectionString; import com.azure.communication.identity.CommunicationIdentityClientBuilder; -import com.azure.communication.rooms.models.*; +import com.azure.communication.rooms.models.CommunicationRoom; +import com.azure.communication.rooms.models.RoomParticipant; import com.azure.core.credential.AzureKeyCredential; import com.azure.core.credential.TokenCredential; import com.azure.core.http.HttpClient; +import com.azure.core.http.HttpPipelineNextPolicy; +import com.azure.core.http.HttpResponse; +import com.azure.core.http.rest.Response; import com.azure.core.test.TestMode; import com.azure.core.test.TestProxyTestBase; import com.azure.core.test.models.BodilessMatcher; @@ -16,18 +20,17 @@ import com.azure.core.test.utils.MockTokenCredential; import com.azure.core.util.Configuration; import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; +import reactor.core.publisher.Mono; import java.time.OffsetDateTime; import java.util.Arrays; -import java.util.Locale; -import reactor.core.publisher.Mono; -import com.azure.core.http.HttpPipelineNextPolicy; -import com.azure.core.http.HttpResponse; -import com.azure.core.http.rest.Response; -import static org.junit.jupiter.api.Assertions.*; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class RoomsTestBase extends TestProxyTestBase { - protected static final TestMode TEST_MODE = initializeTestMode(); + private static final ClientLogger LOGGER = new ClientLogger(RoomsTestBase.class); protected static final String CONNECTION_STRING = Configuration.getGlobalConfiguration().get( "COMMUNICATION_CONNECTION_STRING_ROOMS", @@ -112,23 +115,6 @@ protected void configureTestMode(RoomsClientBuilder builder) { } } - private static TestMode initializeTestMode() { - ClientLogger logger = new ClientLogger(RoomsTestBase.class); - String azureTestMode = Configuration.getGlobalConfiguration().get("AZURE_TEST_MODE"); - if (azureTestMode != null) { - System.out.println("azureTestMode: " + azureTestMode); - try { - return TestMode.valueOf(azureTestMode.toUpperCase(Locale.US)); - } catch (IllegalArgumentException var3) { - logger.error("Could not parse '{}' into TestEnum. Using 'Playback' mode.", azureTestMode); - return TestMode.PLAYBACK; - } - } else { - logger.info("Environment variable '{}' has not been set yet. Using 'Playback' mode.", "AZURE_TEST_MODE"); - return TestMode.PLAYBACK; - } - } - protected RoomsClientBuilder addLoggingPolicy(RoomsClientBuilder builder, String testName) { return builder.addPolicy((context, next) -> logHeaders(testName, next)); } @@ -153,8 +139,8 @@ private Mono logHeaders(String testName, HttpPipelineNextPolicy ne final HttpResponse bufferedResponse = httpResponse.buffer(); // Should sanitize printed reponse url - System.out.println("MS-CV header for " + testName + " request " + bufferedResponse.getRequest().getUrl() - + ": " + bufferedResponse.getHeaderValue("MS-CV")); + LOGGER.log(LogLevel.VERBOSE, () -> "MS-CV header for " + testName + " request " + + bufferedResponse.getRequest().getUrl() + ": " + bufferedResponse.getHeaderValue("MS-CV")); return Mono.just(bufferedResponse); }); } diff --git a/sdk/communication/azure-communication-sms/src/test/java/com/azure/communication/sms/SmsTestBase.java b/sdk/communication/azure-communication-sms/src/test/java/com/azure/communication/sms/SmsTestBase.java index fdffac7a5479..bbfcda8cc29f 100644 --- a/sdk/communication/azure-communication-sms/src/test/java/com/azure/communication/sms/SmsTestBase.java +++ b/sdk/communication/azure-communication-sms/src/test/java/com/azure/communication/sms/SmsTestBase.java @@ -15,11 +15,15 @@ import com.azure.core.test.models.TestProxySanitizerType; import com.azure.core.test.utils.MockTokenCredential; import com.azure.core.util.Configuration; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import reactor.core.publisher.Mono; import java.util.Arrays; public class SmsTestBase extends TestProxyTestBase { + private static final ClientLogger LOGGER = new ClientLogger(SmsTestBase.class); + protected static final String CONNECTION_STRING = Configuration.getGlobalConfiguration() .get("COMMUNICATION_LIVETEST_STATIC_CONNECTION_STRING", "endpoint=https://REDACTED.communication.azure.com/;accesskey=QWNjZXNzS2V5"); @@ -95,8 +99,8 @@ private Mono logHeaders(String testName, HttpPipelineNextPolicy ne final HttpResponse bufferedResponse = httpResponse.buffer(); // Should sanitize printed reponse url - System.out.println("MS-CV header for " + testName + " request " - + bufferedResponse.getRequest().getUrl() + ": " + bufferedResponse.getHeaderValue("MS-CV")); + LOGGER.log(LogLevel.VERBOSE, () -> ("MS-CV header for " + testName + " request " + + bufferedResponse.getRequest().getUrl() + ": " + bufferedResponse.getHeaderValue("MS-CV"))); return Mono.just(bufferedResponse); }); } diff --git a/sdk/confidentialledger/azure-security-confidentialledger/src/test/java/com/azure/security/confidentialledger/ConfidentialLedgerClientTestBase.java b/sdk/confidentialledger/azure-security-confidentialledger/src/test/java/com/azure/security/confidentialledger/ConfidentialLedgerClientTestBase.java index c91b8d5c6cf1..d9c220dd946f 100644 --- a/sdk/confidentialledger/azure-security-confidentialledger/src/test/java/com/azure/security/confidentialledger/ConfidentialLedgerClientTestBase.java +++ b/sdk/confidentialledger/azure-security-confidentialledger/src/test/java/com/azure/security/confidentialledger/ConfidentialLedgerClientTestBase.java @@ -18,6 +18,8 @@ import com.azure.core.test.models.TestProxySanitizer; import com.azure.core.test.models.TestProxySanitizerType; import com.azure.core.util.BinaryData; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.identity.DefaultAzureCredentialBuilder; import com.azure.security.confidentialledger.certificate.ConfidentialLedgerCertificateClient; import com.azure.security.confidentialledger.certificate.ConfidentialLedgerCertificateClientBuilder; @@ -39,6 +41,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; class ConfidentialLedgerClientTestBase extends TestProxyTestBase { + private static final ClientLogger LOGGER = new ClientLogger(ConfidentialLedgerClientTestBase.class); protected static final String TRANSACTION_ID = "transactionId"; protected static final String COLLECTION_ID = "collectionId"; @@ -82,7 +85,7 @@ protected void beforeTest() { try { jsonNode = mapper.readTree(identityResponse.toBytes()); } catch (IOException ex) { - System.out.println("Caught IO exception " + ex); + LOGGER.log(LogLevel.VERBOSE, () -> "Caught IO exception", ex); Assertions.fail(); } @@ -104,7 +107,7 @@ protected void beforeTest() { reactorClient = reactor.netty.http.client.HttpClient.create() .secure(sslContextSpec -> sslContextSpec.sslContext(sslContext)); } catch (SSLException ex) { - System.out.println("Caught SSL exception " + ex); + LOGGER.log(LogLevel.VERBOSE, () -> "Caught SSL exception", ex); Assertions.fail(); } diff --git a/sdk/containerregistry/azure-containers-containerregistry/src/test/java/com/azure/containers/containerregistry/TestUtils.java b/sdk/containerregistry/azure-containers-containerregistry/src/test/java/com/azure/containers/containerregistry/TestUtils.java index d844c0558d86..839f886a4b87 100644 --- a/sdk/containerregistry/azure-containers-containerregistry/src/test/java/com/azure/containers/containerregistry/TestUtils.java +++ b/sdk/containerregistry/azure-containers-containerregistry/src/test/java/com/azure/containers/containerregistry/TestUtils.java @@ -125,7 +125,6 @@ static TokenCredential getCredentialByAuthority(TestMode testMode, String author static void importImage(TestMode mode, String repository, List tags) { try { importImage(mode, REGISTRY_NAME, repository, tags, REGISTRY_ENDPOINT); - Thread.sleep(SLEEP_TIME_IN_MILLISECONDS); } catch (InterruptedException e) { e.printStackTrace(); } @@ -190,6 +189,8 @@ static void importImage(TestMode mode, String registryName, String repository, L Thread.sleep(SLEEP_TIME_IN_MILLISECONDS); } } while (++index < 3); + + Thread.sleep(SLEEP_TIME_IN_MILLISECONDS); } private static OciImageManifest createManifest() { diff --git a/sdk/core/azure-core-management/src/test/java/com/azure/core/management/implementation/polling/LROPollerTests.java b/sdk/core/azure-core-management/src/test/java/com/azure/core/management/implementation/polling/LROPollerTests.java index d20086bf9d0c..031ed96e6cd0 100644 --- a/sdk/core/azure-core-management/src/test/java/com/azure/core/management/implementation/polling/LROPollerTests.java +++ b/sdk/core/azure-core-management/src/test/java/com/azure/core/management/implementation/polling/LROPollerTests.java @@ -22,6 +22,8 @@ import com.azure.core.util.BinaryData; import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.core.util.polling.AsyncPollResponse; import com.azure.core.util.polling.LongRunningOperationStatus; import com.azure.core.util.polling.PollerFlux; @@ -61,6 +63,7 @@ @SuppressWarnings("unchecked") public class LROPollerTests { + private static final ClientLogger LOGGER = new ClientLogger(LROPollerTests.class); private static final SerializerAdapter SERIALIZER = SerializerFactory.createDefaultManagementSerializerAdapter(); @@ -678,8 +681,12 @@ public void lroRetryAfter() { long nanoTime = System.nanoTime(); - FooWithProvisioningState result = lroFlux.doOnNext(response -> System.out.printf("[%s] status %s%n", - OffsetDateTime.now(), response.getStatus().toString())).blockLast().getFinalResult().block(); + FooWithProvisioningState result = lroFlux + .doOnNext(response -> LOGGER.log(LogLevel.VERBOSE, + () -> String.format("[%s] status %s%n", OffsetDateTime.now(), response.getStatus()))) + .blockLast() + .getFinalResult() + .block(); Assertions.assertNotNull(result); Duration pollingDuration = Duration.ofNanos(System.nanoTime() - nanoTime); @@ -879,7 +886,8 @@ public com.github.tomakehurst.wiremock.http.Response transform(Request request, .build(); } if (request.getMethod().isOneOf(RequestMethod.PUT)) { - System.out.printf("[%s] PUT status %s%n", OffsetDateTime.now(), "IN_PROGRESS"); + LOGGER.log(LogLevel.VERBOSE, + () -> String.format("[%s] PUT status %s%n", OffsetDateTime.now(), "IN_PROGRESS")); return new com.github.tomakehurst.wiremock.http.Response.Builder() .headers(serverConfigure.additionalHeaders) .body(toJson(new FooWithProvisioningState("IN_PROGRESS"))) @@ -888,13 +896,15 @@ public com.github.tomakehurst.wiremock.http.Response transform(Request request, if (request.getMethod().isOneOf(RequestMethod.GET)) { getCallCount[0]++; if (getCallCount[0] < serverConfigure.pollingCountTillSuccess) { - System.out.printf("[%s] GET status %s%n", OffsetDateTime.now(), "IN_PROGRESS"); + LOGGER.log(LogLevel.VERBOSE, + () -> String.format("[%s] GET status %s%n", OffsetDateTime.now(), "IN_PROGRESS")); return new com.github.tomakehurst.wiremock.http.Response.Builder() .headers(serverConfigure.additionalHeaders) .body(toJson(new FooWithProvisioningState("IN_PROGRESS"))) .build(); } else if (getCallCount[0] == serverConfigure.pollingCountTillSuccess) { - System.out.printf("[%s] GET status %s%n", OffsetDateTime.now(), "SUCCEEDED"); + LOGGER.log(LogLevel.VERBOSE, + () -> String.format("[%s] GET status %s%n", OffsetDateTime.now(), "SUCCEEDED")); return new com.github.tomakehurst.wiremock.http.Response.Builder() .body(toJson(new FooWithProvisioningState("SUCCEEDED", UUID.randomUUID().toString()))) .build(); diff --git a/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/DigitalTwinsTestBase.java b/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/DigitalTwinsTestBase.java index 3009b8a4fcbf..2cbbb0aad9f6 100644 --- a/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/DigitalTwinsTestBase.java +++ b/sdk/digitaltwins/azure-digitaltwins-core/src/test/java/com/azure/digitaltwins/core/DigitalTwinsTestBase.java @@ -10,7 +10,6 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.http.policy.HttpPipelinePolicy; -import com.azure.core.test.TestMode; import com.azure.core.test.TestProxyTestBase; import com.azure.core.test.models.CustomMatcher; import com.azure.core.util.Configuration; @@ -141,9 +140,7 @@ static T deserializeJsonString(String rawJsonString, Class clazz) throws } void waitIfLive(int waitTimeInSeconds) throws InterruptedException { - if (this.getTestMode() == TestMode.LIVE || this.getTestMode() == TestMode.RECORD) { - Thread.sleep(waitTimeInSeconds * 1000); - } + sleepIfRunningAgainstService(waitTimeInSeconds * 1000L); } void waitIfLive() throws InterruptedException { diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventDataAggregatorTest.java b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventDataAggregatorTest.java index c50f9d4b94a6..86101a67af93 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventDataAggregatorTest.java +++ b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventDataAggregatorTest.java @@ -5,6 +5,8 @@ import com.azure.core.amqp.exception.AmqpErrorCondition; import com.azure.core.amqp.exception.AmqpException; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.messaging.eventhubs.EventHubBufferedProducerAsyncClient.BufferedProducerClientOptions; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -29,6 +31,8 @@ import static org.mockito.Mockito.when; public class EventDataAggregatorTest { + private static final ClientLogger LOGGER = new ClientLogger(EventDataAggregatorTest.class); + private static final String NAMESPACE = "test.namespace"; private static final String PARTITION_ID = "test-id"; @@ -175,7 +179,7 @@ public void pushesBatchAfterMaxTime() { case 1: return batch2; default: - System.out.println("Invoked get batch for the xth time:" + current); + LOGGER.log(LogLevel.VERBOSE, () -> "Invoked get batch for the xth time:" + current); return batch3; } }; diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubBufferedPartitionProducerTest.java b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubBufferedPartitionProducerTest.java index 5ea403598f74..f7714375106c 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubBufferedPartitionProducerTest.java +++ b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubBufferedPartitionProducerTest.java @@ -5,6 +5,8 @@ import com.azure.core.amqp.AmqpRetryOptions; import com.azure.core.amqp.exception.AmqpException; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.messaging.eventhubs.EventHubBufferedProducerAsyncClient.BufferedProducerClientOptions; import com.azure.messaging.eventhubs.models.CreateBatchOptions; import com.azure.messaging.eventhubs.models.SendBatchFailedContext; @@ -49,6 +51,8 @@ */ @Isolated public class EventHubBufferedPartitionProducerTest { + private static final ClientLogger LOGGER = new ClientLogger(EventHubBufferedPartitionProducerTest.class); + private static final String PARTITION_ID = "10"; private static final String NAMESPACE = "test-eventhubs-namespace"; private static final String EVENT_HUB_NAME = "test-hub"; @@ -312,7 +316,7 @@ public void getBufferedEventCounts() throws InterruptedException { final BufferedProducerClientOptions options = new BufferedProducerClientOptions(); options.setMaxWaitTime(Duration.ofSeconds(5)); options.setSendSucceededContext(context -> { - System.out.println("Batch received."); + LOGGER.log(LogLevel.VERBOSE, () -> "Batch received."); holder.onSucceed(context); success.countDown(); }); diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubBufferedProducerAsyncClientIntegrationTest.java b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubBufferedProducerAsyncClientIntegrationTest.java index 33de24fb11ff..d117c200ee0d 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubBufferedProducerAsyncClientIntegrationTest.java +++ b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubBufferedProducerAsyncClientIntegrationTest.java @@ -4,6 +4,7 @@ package com.azure.messaging.eventhubs; import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.messaging.eventhubs.models.SendBatchSucceededContext; import com.azure.messaging.eventhubs.models.SendOptions; import org.junit.jupiter.api.Tag; @@ -196,9 +197,9 @@ public void publishWithPartitionKeys() throws InterruptedException { }); return Mono.delay(Duration.ofSeconds(delay)).then(producer.enqueueEvent(eventData, sendOptions) - .doFinally(signal -> { - System.out.printf("\t[%s] %s Published event.%n", expectedPartitionId, formatter.format(Instant.now())); - })); + .doFinally(signal -> logger.log(LogLevel.VERBOSE, + () -> String.format("\t[%s] %s Published event.%n", expectedPartitionId, + formatter.format(Instant.now()))))); }).collect(Collectors.toList()); // Waiting for at least maxWaitTime because events will get published by then. diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubConsumerAsyncClientTest.java b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubConsumerAsyncClientTest.java index 8b9bdaa665eb..06a1e658e7e7 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubConsumerAsyncClientTest.java +++ b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubConsumerAsyncClientTest.java @@ -24,6 +24,7 @@ import com.azure.core.util.Context; import com.azure.core.util.CoreUtils; import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.core.util.tracing.SpanKind; import com.azure.core.util.tracing.StartSpanOptions; import com.azure.core.util.tracing.Tracer; @@ -960,9 +961,9 @@ private void assertStartOptions(StartSpanOptions startOpts) { } private void assertPartition(String partitionId, PartitionEvent event) { - System.out.println("Event received: " + event.getPartitionContext().getPartitionId()); + LOGGER.log(LogLevel.VERBOSE, () -> "Event received: " + event.getPartitionContext().getPartitionId()); final Object value = event.getData().getProperties().get(PARTITION_ID_HEADER); - Assertions.assertTrue(value instanceof String); + Assertions.assertInstanceOf(String.class, value); Assertions.assertEquals(partitionId, value); Assertions.assertEquals(partitionId, event.getPartitionContext().getPartitionId()); diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubConsumerClientTest.java b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubConsumerClientTest.java index 2843c5f92bd9..214592630966 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubConsumerClientTest.java +++ b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventHubConsumerClientTest.java @@ -15,6 +15,8 @@ import com.azure.core.util.ClientOptions; import com.azure.core.util.Configuration; import com.azure.core.util.IterableStream; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.messaging.eventhubs.implementation.ClientConstants; import com.azure.messaging.eventhubs.implementation.EventHubAmqpConnection; import com.azure.messaging.eventhubs.implementation.EventHubConnectionProcessor; @@ -64,6 +66,8 @@ import static org.mockito.Mockito.when; public class EventHubConsumerClientTest { + private static final ClientLogger LOGGER = new ClientLogger(EventHubConsumerClientTest.class); + private static final ClientOptions CLIENT_OPTIONS = new ClientOptions(); private static final String PAYLOAD = "hello"; private static final byte[] PAYLOAD_BYTES = PAYLOAD.getBytes(UTF_8); @@ -131,10 +135,10 @@ AmqpTransportType.AMQP_WEB_SOCKETS, new AmqpRetryOptions(), ProxyOptions.SYSTEM_ when(connection.createReceiveLink(any(), argThat(name -> name.endsWith(PARTITION_ID)), any(EventPosition.class), any(ReceiveOptions.class), anyString())).thenReturn( Mono.fromCallable(() -> { - System.out.println("Returning first link"); + LOGGER.log(LogLevel.VERBOSE, () -> "Returning first link"); return amqpReceiveLink; }), Mono.fromCallable(() -> { - System.out.println("Returning second link"); + LOGGER.log(LogLevel.VERBOSE, () -> "Returning second link"); return amqpReceiveLink2; })); @@ -291,11 +295,11 @@ public void receivesMultipleTimes() { final IterableStream receive2 = consumer.receiveFromPartition(PARTITION_ID, secondReceive, EventPosition.earliest()); // Assert - System.out.println("First receive."); + LOGGER.log(LogLevel.VERBOSE, () -> "First receive."); final Map firstActual = receive.stream() .collect(Collectors.toMap(EventHubConsumerClientTest::getPositionId, Function.identity())); - System.out.println("Second receive."); + LOGGER.log(LogLevel.VERBOSE, () -> "Second receive."); final Map secondActual = receive2.stream() .collect(Collectors.toMap(EventHubConsumerClientTest::getPositionId, Function.identity())); diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventPositionIntegrationTest.java b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventPositionIntegrationTest.java index bc8d559f26c5..8943cbb8204a 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventPositionIntegrationTest.java +++ b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventPositionIntegrationTest.java @@ -5,6 +5,7 @@ import com.azure.core.util.IterableStream; import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.messaging.eventhubs.models.EventPosition; import com.azure.messaging.eventhubs.models.PartitionEvent; import com.azure.messaging.eventhubs.models.SendOptions; @@ -59,7 +60,7 @@ protected void beforeTest() { for (Map.Entry entry : integrationTestData.entrySet()) { testData = entry.getValue(); - System.out.printf("Getting entry for: %s%n", testData.getPartitionId()); + logger.log(LogLevel.VERBOSE, () -> "Getting entry for: " + testData.getPartitionId()); break; } diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventProcessorClientBuilderTest.java b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventProcessorClientBuilderTest.java index 6399a399f8e3..467b2a27e703 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventProcessorClientBuilderTest.java +++ b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/EventProcessorClientBuilderTest.java @@ -8,6 +8,8 @@ import com.azure.core.util.ClientOptions; import com.azure.core.util.Configuration; import com.azure.core.util.TracingOptions; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.messaging.eventhubs.implementation.ClientConstants; import com.azure.messaging.eventhubs.models.CloseContext; import com.azure.messaging.eventhubs.models.ErrorContext; @@ -35,6 +37,7 @@ * Unit tests for {@link EventProcessorClientBuilder}. */ public class EventProcessorClientBuilderTest { + private static final ClientLogger LOGGER = new ClientLogger(EventProcessorClientBuilderTest.class); private static final String NAMESPACE_NAME = "dummyNamespaceName"; private static final String DEFAULT_DOMAIN_NAME = Configuration.getGlobalConfiguration() @@ -68,13 +71,14 @@ public void testEventProcessorBuilderMissingProperties() { EventProcessorClient eventProcessorClient = new EventProcessorClientBuilder() .checkpointStore(new SampleCheckpointStore()) .processEvent(eventContext -> { - System.out.println("Partition id = " + eventContext.getPartitionContext().getPartitionId() + " and " - + "sequence number of event = " + eventContext.getEventData().getSequenceNumber()); + LOGGER.log(LogLevel.VERBOSE, () -> "Partition id = " + + eventContext.getPartitionContext().getPartitionId() + " and sequence number of event = " + + eventContext.getEventData().getSequenceNumber()); }) .processError(errorContext -> { - System.out.printf("Error occurred in partition processor for partition %s, %s%n", - errorContext.getPartitionContext().getPartitionId(), - errorContext.getThrowable()); + LOGGER.log(LogLevel.VERBOSE, () -> String.format( + "Error occurred in partition processor for partition %s, %s%n", + errorContext.getPartitionContext().getPartitionId(), errorContext.getThrowable())); }) .buildEventProcessorClient(); }); @@ -86,13 +90,14 @@ public void testEventProcessorBuilderWithProcessEvent() { .connectionString(CORRECT_CONNECTION_STRING) .consumerGroup("consumer-group") .processEvent(eventContext -> { - System.out.println("Partition id = " + eventContext.getPartitionContext().getPartitionId() + " and " - + "sequence number of event = " + eventContext.getEventData().getSequenceNumber()); + LOGGER.log(LogLevel.VERBOSE, () -> "Partition id = " + + eventContext.getPartitionContext().getPartitionId() + " and sequence number of event = " + + eventContext.getEventData().getSequenceNumber()); }) .processError(errorContext -> { - System.out.printf("Error occurred in partition processor for partition %s, %s%n", - errorContext.getPartitionContext().getPartitionId(), - errorContext.getThrowable()); + LOGGER.log(LogLevel.VERBOSE, () -> String.format( + "Error occurred in partition processor for partition %s, %s%n", + errorContext.getPartitionContext().getPartitionId(), errorContext.getThrowable())); }) .checkpointStore(new SampleCheckpointStore()) .buildEventProcessorClient(); @@ -107,21 +112,21 @@ public void testEventProcessorBuilderWithBothSingleAndBatchConsumers() { .checkpointStore(new SampleCheckpointStore()) .consumerGroup("consumer-group") .processEvent(eventContext -> { - System.out.println("Partition id = " + eventContext.getPartitionContext().getPartitionId() + " and " - + "sequence number of event = " + eventContext.getEventData().getSequenceNumber()); + LOGGER.log(LogLevel.VERBOSE, () -> ("Partition id = " + + eventContext.getPartitionContext().getPartitionId() + " and sequence number of event = " + + eventContext.getEventData().getSequenceNumber())); }) .processEventBatch(eventBatchContext -> { eventBatchContext.getEvents().forEach(event -> { - System.out - .println( - "Partition id = " + eventBatchContext.getPartitionContext().getPartitionId() + " and " - + "sequence number of event = " + event.getSequenceNumber()); + LOGGER.log(LogLevel.VERBOSE, () -> "Partition id = " + + eventBatchContext.getPartitionContext().getPartitionId() + + " and sequence number of event = " + event.getSequenceNumber()); }); }, 5, Duration.ofSeconds(1)) .processError(errorContext -> { - System.out.printf("Error occurred in partition processor for partition %s, %s%n", - errorContext.getPartitionContext().getPartitionId(), - errorContext.getThrowable()); + LOGGER.log(LogLevel.VERBOSE, () -> String.format( + "Error occurred in partition processor for partition %s, %s%n", + errorContext.getPartitionContext().getPartitionId(), errorContext.getThrowable())); }) .buildEventProcessorClient(); }); @@ -134,9 +139,9 @@ public void testEventProcessorBuilderWithNoProcessEventConsumer() { .checkpointStore(new SampleCheckpointStore()) .consumerGroup("consumer-group") .processError(errorContext -> { - System.out.printf("Error occurred in partition processor for partition %s, %s%n", - errorContext.getPartitionContext().getPartitionId(), - errorContext.getThrowable()); + LOGGER.log(LogLevel.VERBOSE, () -> String.format( + "Error occurred in partition processor for partition %s, %s%n", + errorContext.getPartitionContext().getPartitionId(), errorContext.getThrowable())); }) .buildEventProcessorClient(); }); @@ -149,15 +154,15 @@ public void testEventProcessorBuilderWithProcessEventBatch() { .consumerGroup("consumer-group") .processEventBatch(eventBatchContext -> { eventBatchContext.getEvents().forEach(event -> { - System.out - .println("Partition id = " + eventBatchContext.getPartitionContext().getPartitionId() + " and " - + "sequence number of event = " + event.getSequenceNumber()); + LOGGER.log(LogLevel.VERBOSE, () -> ("Partition id = " + + eventBatchContext.getPartitionContext().getPartitionId() + " and sequence number of event = " + + event.getSequenceNumber())); }); }, 5, Duration.ofSeconds(1)) .processError(errorContext -> { - System.out.printf("Error occurred in partition processor for partition %s, %s%n", - errorContext.getPartitionContext().getPartitionId(), - errorContext.getThrowable()); + LOGGER.log(LogLevel.VERBOSE, () -> String.format( + "Error occurred in partition processor for partition %s, %s%n", + errorContext.getPartitionContext().getPartitionId(), errorContext.getThrowable())); }) .checkpointStore(new SampleCheckpointStore()) .buildEventProcessorClient(); @@ -174,15 +179,15 @@ public void initialOffsetProviderSetMoreThanOne() { .consumerGroup("consumer-group") .processEventBatch(eventBatchContext -> { eventBatchContext.getEvents().forEach(event -> { - System.out - .println("Partition id = " + eventBatchContext.getPartitionContext().getPartitionId() + " and " - + "sequence number of event = " + event.getSequenceNumber()); + LOGGER.log(LogLevel.VERBOSE, () -> "Partition id = " + + eventBatchContext.getPartitionContext().getPartitionId() + " and sequence number of event = " + + event.getSequenceNumber()); }); }, 5, Duration.ofSeconds(1)) .processError(errorContext -> { - System.out.printf("Error occurred in partition processor for partition %s, %s%n", - errorContext.getPartitionContext().getPartitionId(), - errorContext.getThrowable()); + LOGGER.log(LogLevel.VERBOSE, () -> String.format( + "Error occurred in partition processor for partition %s, %s%n", + errorContext.getPartitionContext().getPartitionId(), errorContext.getThrowable())); }) .checkpointStore(new SampleCheckpointStore()); @@ -215,15 +220,15 @@ public void initialEventPositionProvider() { .consumerGroup("consumer-group") .processEventBatch(eventBatchContext -> { eventBatchContext.getEvents().forEach(event -> { - System.out - .println("Partition id = " + eventBatchContext.getPartitionContext().getPartitionId() + " and " - + "sequence number of event = " + event.getSequenceNumber()); + LOGGER.log(LogLevel.VERBOSE, () -> "Partition id = " + + eventBatchContext.getPartitionContext().getPartitionId() + " and sequence number of event = " + + event.getSequenceNumber()); }); }, 5, Duration.ofSeconds(1)) .processError(errorContext -> { - System.out.printf("Error occurred in partition processor for partition %s, %s%n", - errorContext.getPartitionContext().getPartitionId(), - errorContext.getThrowable()); + LOGGER.log(LogLevel.VERBOSE, () -> String.format( + "Error occurred in partition processor for partition %s, %s%n", + errorContext.getPartitionContext().getPartitionId(), errorContext.getThrowable())); }) .checkpointStore(new SampleCheckpointStore()) .initialPartitionEventPosition(eventPositionFunction) @@ -257,15 +262,15 @@ public void initialEventPositionMap() { .consumerGroup("consumer-group") .processEventBatch(eventBatchContext -> { eventBatchContext.getEvents().forEach(event -> { - System.out - .println("Partition id = " + eventBatchContext.getPartitionContext().getPartitionId() + " and " - + "sequence number of event = " + event.getSequenceNumber()); + LOGGER.log(LogLevel.VERBOSE, () -> "Partition id = " + + eventBatchContext.getPartitionContext().getPartitionId() + " and sequence number of event = " + + event.getSequenceNumber()); }); }, 5, Duration.ofSeconds(1)) .processError(errorContext -> { - System.out.printf("Error occurred in partition processor for partition %s, %s%n", - errorContext.getPartitionContext().getPartitionId(), - errorContext.getThrowable()); + LOGGER.log(LogLevel.VERBOSE, () -> String.format( + "Error occurred in partition processor for partition %s, %s%n", + errorContext.getPartitionContext().getPartitionId(), errorContext.getThrowable())); }) .checkpointStore(new SampleCheckpointStore()) .initialPartitionEventPosition(eventPositionMap) diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/IntegrationTestBase.java b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/IntegrationTestBase.java index ed526061a5a0..40acadca38c1 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/IntegrationTestBase.java +++ b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/IntegrationTestBase.java @@ -16,6 +16,7 @@ import com.azure.core.util.Configuration; import com.azure.core.util.CoreUtils; import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.identity.ClientSecretCredential; import com.azure.identity.ClientSecretCredentialBuilder; import com.azure.messaging.eventhubs.models.SendOptions; @@ -59,6 +60,8 @@ * Test base for running integration tests. */ public abstract class IntegrationTestBase extends TestBase { + private static final ClientLogger LOGGER = new ClientLogger(IntegrationTestBase.class); + // The number of partitions we create in test-resources.json. // Partitions 0 and 1 are used for consume-only operations. 2, 3, and 4 are used to publish or consume events. protected static final int NUMBER_OF_PARTITIONS = 5; @@ -193,7 +196,7 @@ static String getConnectionString(boolean withSas) { } return String.format(connectionStringWithSasAndEntityFormat, endpoint, signatureValue, entityPath); } catch (Exception e) { - e.printStackTrace(); + LOGGER.log(LogLevel.VERBOSE, () -> "Error while getting connection string", e); } } return connectionString; diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/LongRunningTest.java b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/LongRunningTest.java index 79e8dc03672c..d1b6c899d297 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/LongRunningTest.java +++ b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/LongRunningTest.java @@ -4,6 +4,7 @@ package com.azure.messaging.eventhubs; import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.messaging.eventhubs.models.CreateBatchOptions; import com.azure.messaging.eventhubs.models.EventPosition; import org.junit.jupiter.api.Disabled; @@ -70,17 +71,12 @@ void twoConsumersAndSender() throws InterruptedException { return producer.send(batch).thenReturn(Instant.now()); })) - .subscribe(instant -> { - System.out.println("Sent batch at: " + instant); - }, error -> { - logger.error("Error sending batch: ", error); - }, () -> { - logger.info("Complete."); - })); + .subscribe(instant -> logger.log(LogLevel.VERBOSE, () -> "Sent batch at: " + instant), + error -> logger.error("Error sending batch: ", error), () -> logger.info("Complete."))); - System.out.println("Sleeping while performing work."); + logger.log(LogLevel.VERBOSE, () -> "Sleeping while performing work."); TimeUnit.MINUTES.sleep(duration.toMinutes()); - System.out.println("Complete."); + logger.log(LogLevel.VERBOSE, () -> "Complete."); } @Disabled("Testing idle clients. Connections are timed out at 30 mins.") @@ -90,7 +86,7 @@ void idleConnection() throws InterruptedException { .connectionString(getConnectionString()) .buildAsyncProducerClient()) { for (int i = 0; i < 4; i++) { - System.out.println("Iteration: " + i); + logger.verbose("Iteration: " + i); toClose(idleProducer.createBatch().flatMap(batch -> { IntStream.range(0, 3).mapToObj(number -> new EventData("Number : " + number)) @@ -102,17 +98,12 @@ void idleConnection() throws InterruptedException { }); return idleProducer.send(batch).thenReturn(Instant.now()); - }).subscribe(instant -> { - System.out.println("Sent batch at: " + instant); - }, error -> { - logger.error("Error sending batch: ", error); - }, () -> { - logger.info("Complete."); - })); - - System.out.println("Sleeping 40 mins."); + }).subscribe(instant -> logger.log(LogLevel.VERBOSE, () -> "Sent batch at: " + instant), + error -> logger.error("Error sending batch: ", error), () -> logger.info("Complete."))); + + logger.log(LogLevel.VERBOSE, () -> "Sleeping 40 mins."); TimeUnit.MINUTES.sleep(40); - System.out.println("Complete."); + logger.log(LogLevel.VERBOSE, () -> "Complete."); } } } @@ -125,14 +116,14 @@ void idleSendLinks() throws InterruptedException { .buildAsyncProducerClient()) { for (int i = 0; i < 4; i++) { - System.out.println("Iteration: " + i); + logger.verbose("Iteration: " + i); toClose(idleProducer.getEventHubProperties().subscribe(properties -> { - System.out.printf("[%s]: ids[%s]. Received: %s%n", + logger.log(LogLevel.VERBOSE, () -> String.format("[%s]: ids[%s]. Received: %s%n", properties.getName(), String.join(",", properties.getPartitionIds()), - Instant.now()); - }, error -> System.err.println("Error receiving ids: " + error))); + Instant.now())); + }, error -> logger.log(LogLevel.VERBOSE, () -> "Error receiving ids", error))); toClose(idleProducer.createBatch().flatMap(batch -> { IntStream.range(0, 3).mapToObj(number -> new EventData("Number : " + number)) @@ -144,13 +135,12 @@ void idleSendLinks() throws InterruptedException { }); return idleProducer.send(batch).thenReturn(Instant.now()); - }).subscribe(instant -> { - System.out.println("Sent batch at: " + instant); - }, error -> System.err.println("Error sending batch: " + error))); + }).subscribe(instant -> logger.log(LogLevel.VERBOSE, () -> "Sent batch at: " + instant), + error -> logger.log(LogLevel.VERBOSE, () -> "Error sending batch", error))); - System.out.println("Sleeping 15 mins."); + logger.log(LogLevel.VERBOSE, () -> "Sleeping 15 mins."); TimeUnit.MINUTES.sleep(15); - System.out.println("Completed sleep."); + logger.log(LogLevel.VERBOSE, () -> "Completed sleep."); } } } @@ -173,12 +163,9 @@ void worksAfterReconnection() throws InterruptedException { toClose(Flux.interval(Duration.ofSeconds(1)) .flatMap(position -> client.getPartitionIds().collectList()) .subscribe(partitionIds -> { - System.out.printf("Ids %s: {%s}%n", Instant.now(), String.join(",", partitionIds)); - }, error -> { - logger.error("Error fetching info.", error); - }, () -> { - logger.info("Complete."); - })); + logger.log(LogLevel.VERBOSE, + () -> String.format("Ids %s: {%s}%n", Instant.now(), String.join(",", partitionIds))); + }, error -> logger.error("Error fetching info.", error), () -> logger.info("Complete."))); toClose(Flux.interval(Duration.ofSeconds(5)) .flatMap(position -> producer.createBatch(options).flatMap(batch -> { IntStream.range(0, 3).mapToObj(number -> new EventData("Position" + position + ": " + number)) @@ -191,16 +178,11 @@ void worksAfterReconnection() throws InterruptedException { return producer.send(batch).thenReturn(Instant.now()); })) - .subscribe(instant -> { - System.out.println("---- Sent batch at: " + instant); - }, error -> { - logger.error("---- Error sending batch: ", error); - }, () -> { - logger.info("---- Complete."); - })); + .subscribe(instant -> logger.log(LogLevel.VERBOSE, () -> "---- Sent batch at: " + instant), + error -> logger.error("---- Error sending batch: ", error), () -> logger.info("---- Complete."))); - System.out.println("Sleeping while performing work."); + logger.log(LogLevel.VERBOSE, () -> "Sleeping while performing work."); TimeUnit.MINUTES.sleep(30); - System.out.println("Complete."); + logger.log(LogLevel.VERBOSE, () -> "Complete."); } } diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/PartitionBasedLoadBalancerTest.java b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/PartitionBasedLoadBalancerTest.java index 1fa96bf7fdc9..5d277e366132 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/PartitionBasedLoadBalancerTest.java +++ b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/PartitionBasedLoadBalancerTest.java @@ -4,6 +4,7 @@ package com.azure.messaging.eventhubs; import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.messaging.eventhubs.implementation.PartitionProcessor; import com.azure.messaging.eventhubs.implementation.instrumentation.EventHubsTracer; import com.azure.messaging.eventhubs.models.ErrorContext; @@ -17,7 +18,6 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestInfo; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; @@ -109,8 +109,7 @@ public class PartitionBasedLoadBalancerTest { private final EventProcessorClientOptions processorOptions = new EventProcessorClientOptions(); @BeforeEach - public void setup(TestInfo testInfo) { - System.out.println("Running " + testInfo.getDisplayName()); + public void setup() { toClose = new ArrayList<>(); mockCloseable = MockitoAnnotations.openMocks(this); @@ -142,7 +141,7 @@ public void teardown() throws Exception { try { closeable.close(); } catch (IOException error) { - error.printStackTrace(); + LOGGER.log(LogLevel.VERBOSE, () -> "Error closing resource.", error); } } diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/ProxySelectorTest.java b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/ProxySelectorTest.java index 9562eac39f4e..c43bebc11c50 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/ProxySelectorTest.java +++ b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/ProxySelectorTest.java @@ -6,6 +6,7 @@ import com.azure.core.amqp.AmqpRetryOptions; import com.azure.core.amqp.AmqpTransportType; import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.messaging.eventhubs.models.EventPosition; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; @@ -27,6 +28,8 @@ @Tag(TestUtils.INTEGRATION) class ProxySelectorTest extends IntegrationTestBase { + private static final ClientLogger LOGGER = new ClientLogger(ProxySelectorTest.class); + private static final int PROXY_PORT = 8899; private static final InetSocketAddress SIMPLE_PROXY_ADDRESS = new InetSocketAddress("localhost", PROXY_PORT); private ProxySelector defaultProxySelector; @@ -73,7 +76,7 @@ public void connectFailed(URI uri, SocketAddress sa, IOException ioe) { .expectErrorSatisfies(error -> { // The message can vary because it is returned from proton-j, so we don't want to compare against that. // This is a transient error from ExceptionUtil.java: line 67. - System.out.println("Error: " + error); + LOGGER.log(LogLevel.VERBOSE, () -> "Error", error); }) .verify(TIMEOUT); diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/implementation/AmqpReceiveLinkProcessorTest.java b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/implementation/AmqpReceiveLinkProcessorTest.java index c731b8bea014..b7acff2826e5 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/implementation/AmqpReceiveLinkProcessorTest.java +++ b/sdk/eventhubs/azure-messaging-eventhubs/src/test/java/com/azure/messaging/eventhubs/implementation/AmqpReceiveLinkProcessorTest.java @@ -10,6 +10,8 @@ import com.azure.core.amqp.exception.AmqpErrorContext; import com.azure.core.amqp.exception.AmqpException; import com.azure.core.amqp.implementation.AmqpReceiveLink; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.messaging.eventhubs.implementation.instrumentation.EventHubsConsumerInstrumentation; import org.apache.qpid.proton.message.Message; import org.junit.jupiter.api.AfterEach; @@ -49,6 +51,8 @@ import static org.mockito.Mockito.when; class AmqpReceiveLinkProcessorTest { + private static final ClientLogger LOGGER = new ClientLogger(AmqpReceiveLinkProcessorTest.class); + private static final int PREFETCH = 5; private static final EventHubsConsumerInstrumentation DEFAULT_INSTRUMENTATION = new EventHubsConsumerInstrumentation(null, null, "hostname", "hubname", "$Default", false); @@ -190,9 +194,9 @@ void respectsBackpressureLessThanMinimum() { // Act processor.subscribe( - e -> System.out.println("message: " + e), + e -> LOGGER.log(LogLevel.VERBOSE, () -> "message: " + e), Assertions::fail, - () -> System.out.println("Complete."), + () -> LOGGER.log(LogLevel.VERBOSE, () -> "Complete."), s -> s.request(backpressure)); // Assert @@ -554,7 +558,7 @@ void onlyRequestsWhenCreditsLessThanPrefetch() { assertNotNull(integerSupplier); // Invoking this once. Should return a value and notify that there are no credits left on the link. final int messages = integerSupplier.get(); - System.out.println("Messages: " + messages); + LOGGER.log(LogLevel.VERBOSE, () -> "Messages: " + messages); }) .expectNoEvent(Duration.ofSeconds(1)) .thenRequest(nextRequest) diff --git a/sdk/healthinsights/azure-health-insights-radiologyinsights/README.md b/sdk/healthinsights/azure-health-insights-radiologyinsights/README.md index 13782c80c116..bb5249bfbb72 100644 --- a/sdk/healthinsights/azure-health-insights-radiologyinsights/README.md +++ b/sdk/healthinsights/azure-health-insights-radiologyinsights/README.md @@ -121,7 +121,7 @@ private static List createPatientRecords() { // Use LocalDate to set Date patientDetails.setBirthDate(LocalDate.of(1959, 11, 11)); - + patientRecord.setInfo(patientDetails); Encounter encounter = new Encounter("encounterid1"); @@ -151,7 +151,7 @@ private static List createPatientRecords() { patientDocument.setSpecialtyType(SpecialtyType.RADIOLOGY); DocumentAdministrativeMetadata adminMetadata = new DocumentAdministrativeMetadata(); - FhirR4Extendible orderedProcedure = new FhirR4Extendible(); + OrderedProcedure orderedProcedure = new OrderedProcedure(); FhirR4CodeableConcept procedureCode = new FhirR4CodeableConcept(); FhirR4Coding procedureCoding = new FhirR4Coding(); @@ -240,8 +240,8 @@ Display critical result inferences from the example request results. ```java com.azure.health.insights.radiologyinsights.displayresults List patientResults = radiologyInsightsResult.getPatientResults(); for (RadiologyInsightsPatientResult patientResult : patientResults) { - List inferences = patientResult.getInferences(); - for (FhirR4Extendible1 inference : inferences) { + List inferences = patientResult.getInferences(); + for (RadiologyInsightsInference inference : inferences) { if (inference instanceof CriticalResultInference) { CriticalResultInference criticalResultInference = (CriticalResultInference) inference; String description = criticalResultInference.getResult().getDescription(); diff --git a/sdk/keyvault/azure-security-keyvault-certificates/src/test/java/com/azure/security/keyvault/certificates/CertificateClientTest.java b/sdk/keyvault/azure-security-keyvault-certificates/src/test/java/com/azure/security/keyvault/certificates/CertificateClientTest.java index 176841ed1efa..393a22f5e03f 100644 --- a/sdk/keyvault/azure-security-keyvault-certificates/src/test/java/com/azure/security/keyvault/certificates/CertificateClientTest.java +++ b/sdk/keyvault/azure-security-keyvault-certificates/src/test/java/com/azure/security/keyvault/certificates/CertificateClientTest.java @@ -9,6 +9,8 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.core.test.http.AssertingHttpClientBuilder; import com.azure.core.util.Context; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.core.util.polling.LongRunningOperationStatus; import com.azure.core.util.polling.PollResponse; import com.azure.core.util.polling.SyncPoller; @@ -68,6 +70,8 @@ import static org.junit.jupiter.api.Assertions.fail; public class CertificateClientTest extends CertificateClientTestBase { + private static final ClientLogger LOGGER = new ClientLogger(CertificateClientTest.class); + private CertificateClient certificateClient; @Override @@ -975,7 +979,7 @@ private void pollOnCertificatePurge(String certificateName) { } } - System.err.printf("Deleted Key %s was not purged \n", certificateName); + LOGGER.log(LogLevel.VERBOSE, () -> "Deleted Certificate " + certificateName + " was not purged"); } } diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/test/java/com/azure/security/keyvault/keys/KeyAsyncClientTest.java b/sdk/keyvault/azure-security-keyvault-keys/src/test/java/com/azure/security/keyvault/keys/KeyAsyncClientTest.java index 3012b65ad5d2..3cb7feb45efa 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/src/test/java/com/azure/security/keyvault/keys/KeyAsyncClientTest.java +++ b/sdk/keyvault/azure-security-keyvault-keys/src/test/java/com/azure/security/keyvault/keys/KeyAsyncClientTest.java @@ -7,6 +7,8 @@ import com.azure.core.exception.ResourceNotFoundException; import com.azure.core.http.HttpClient; import com.azure.core.test.TestMode; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.core.util.polling.AsyncPollResponse; import com.azure.core.util.polling.PollerFlux; import com.azure.security.keyvault.keys.cryptography.CryptographyAsyncClient; @@ -41,6 +43,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; public class KeyAsyncClientTest extends KeyClientTestBase { + private static final ClientLogger LOGGER = new ClientLogger(KeyAsyncClientTest.class); protected KeyAsyncClient keyAsyncClient; @Override @@ -838,7 +841,7 @@ private void pollOnKeyPurge(String keyName) { } } - System.err.printf("Deleted Key %s was not purged \n", keyName); + LOGGER.log(LogLevel.VERBOSE, () -> "Deleted Key " + keyName + " was not purged"); } } diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/test/java/com/azure/security/keyvault/keys/KeyClientTest.java b/sdk/keyvault/azure-security-keyvault-keys/src/test/java/com/azure/security/keyvault/keys/KeyClientTest.java index 10ace970322b..ae77209705b3 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/src/test/java/com/azure/security/keyvault/keys/KeyClientTest.java +++ b/sdk/keyvault/azure-security-keyvault-keys/src/test/java/com/azure/security/keyvault/keys/KeyClientTest.java @@ -7,6 +7,8 @@ import com.azure.core.exception.ResourceNotFoundException; import com.azure.core.http.HttpClient; import com.azure.core.test.TestMode; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.core.util.polling.SyncPoller; import com.azure.security.keyvault.keys.cryptography.CryptographyClient; import com.azure.security.keyvault.keys.cryptography.models.EncryptionAlgorithm; @@ -40,6 +42,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; public class KeyClientTest extends KeyClientTestBase { + private static final ClientLogger LOGGER = new ClientLogger(KeyClientTest.class); + protected KeyClient keyClient; @Override @@ -751,6 +755,6 @@ private void pollOnKeyPurge(String keyName) { } } - System.err.printf("Deleted Key %s was not purged \n", keyName); + LOGGER.log(LogLevel.VERBOSE, () -> "Deleted Key " + keyName + " was not purged"); } } diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/test/java/com/azure/security/keyvault/keys/cryptography/CryptographyClientTest.java b/sdk/keyvault/azure-security-keyvault-keys/src/test/java/com/azure/security/keyvault/keys/cryptography/CryptographyClientTest.java index 419c079e7854..01e37bb6cdac 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/src/test/java/com/azure/security/keyvault/keys/cryptography/CryptographyClientTest.java +++ b/sdk/keyvault/azure-security-keyvault-keys/src/test/java/com/azure/security/keyvault/keys/cryptography/CryptographyClientTest.java @@ -4,6 +4,8 @@ package com.azure.security.keyvault.keys.cryptography; import com.azure.core.http.HttpClient; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.security.keyvault.keys.KeyClient; import com.azure.security.keyvault.keys.cryptography.models.EncryptParameters; import com.azure.security.keyvault.keys.cryptography.models.EncryptionAlgorithm; @@ -40,6 +42,8 @@ import static org.junit.jupiter.api.Assertions.fail; public class CryptographyClientTest extends CryptographyClientTestBase { + private static final ClientLogger LOGGER = new ClientLogger(CryptographyClientTest.class); + private KeyClient client; @Override @@ -349,7 +353,7 @@ public void signDataVerifyEcLocal() { } catch (InvalidAlgorithmParameterException | NoSuchAlgorithmException e) { // Could not generate a KeyPair from the given JsonWebKey. // It's likely this happened for key curve secp256k1, which is not supported on Java 16+. - e.printStackTrace(); + LOGGER.log(LogLevel.VERBOSE, () -> "Failed to generate key pair from JsonWebKey.", e); return; } diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/test/java/com/azure/security/keyvault/keys/cryptography/CryptographyClientTestBase.java b/sdk/keyvault/azure-security-keyvault-keys/src/test/java/com/azure/security/keyvault/keys/cryptography/CryptographyClientTestBase.java index 91e7ed3f2276..3aecf85da493 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/src/test/java/com/azure/security/keyvault/keys/cryptography/CryptographyClientTestBase.java +++ b/sdk/keyvault/azure-security-keyvault-keys/src/test/java/com/azure/security/keyvault/keys/cryptography/CryptographyClientTestBase.java @@ -15,6 +15,7 @@ import com.azure.core.test.utils.MockTokenCredential; import com.azure.core.util.Configuration; import com.azure.core.util.Context; +import com.azure.core.util.logging.ClientLogger; import com.azure.identity.ClientSecretCredentialBuilder; import com.azure.security.keyvault.keys.KeyClientBuilder; import com.azure.security.keyvault.keys.KeyServiceVersion; @@ -52,6 +53,8 @@ import static org.junit.jupiter.api.Assertions.assertArrayEquals; public abstract class CryptographyClientTestBase extends TestProxyTestBase { + private static final ClientLogger LOGGER = new ClientLogger(CryptographyClientTestBase.class); + protected boolean isHsmEnabled = false; protected boolean runManagedHsmTest = false; @@ -338,10 +341,6 @@ public String getEndpoint() { } public void sleep(long millis) { - try { - Thread.sleep(millis); - } catch (InterruptedException e) { - e.printStackTrace(); - } + sleepIfRunningAgainstService(millis); } } diff --git a/sdk/keyvault/azure-security-keyvault-secrets/src/test/java/com/azure/security/keyvault/secrets/SecretAsyncClientTest.java b/sdk/keyvault/azure-security-keyvault-secrets/src/test/java/com/azure/security/keyvault/secrets/SecretAsyncClientTest.java index 155f022e979a..63fffc5dffbe 100644 --- a/sdk/keyvault/azure-security-keyvault-secrets/src/test/java/com/azure/security/keyvault/secrets/SecretAsyncClientTest.java +++ b/sdk/keyvault/azure-security-keyvault-secrets/src/test/java/com/azure/security/keyvault/secrets/SecretAsyncClientTest.java @@ -7,6 +7,8 @@ import com.azure.core.exception.ResourceNotFoundException; import com.azure.core.http.HttpClient; import com.azure.core.test.http.AssertingHttpClientBuilder; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.core.util.polling.AsyncPollResponse; import com.azure.core.util.polling.PollerFlux; import com.azure.security.keyvault.secrets.implementation.KeyVaultCredentialPolicy; @@ -29,6 +31,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; public class SecretAsyncClientTest extends SecretClientTestBase { + private static final ClientLogger LOGGER = new ClientLogger(SecretAsyncClientTest.class); + private SecretAsyncClient secretAsyncClient; @Override @@ -574,6 +578,6 @@ private void pollOnSecretPurge(String secretName) { } } - System.err.printf("Deleted Secret %s was not purged \n", secretName); + LOGGER.log(LogLevel.VERBOSE, () -> "Deleted Secret " + secretName + " was not purged"); } } diff --git a/sdk/keyvault/azure-security-keyvault-secrets/src/test/java/com/azure/security/keyvault/secrets/SecretClientTest.java b/sdk/keyvault/azure-security-keyvault-secrets/src/test/java/com/azure/security/keyvault/secrets/SecretClientTest.java index 0e8309f0b9ce..4e43e1a38cb8 100644 --- a/sdk/keyvault/azure-security-keyvault-secrets/src/test/java/com/azure/security/keyvault/secrets/SecretClientTest.java +++ b/sdk/keyvault/azure-security-keyvault-secrets/src/test/java/com/azure/security/keyvault/secrets/SecretClientTest.java @@ -7,6 +7,8 @@ import com.azure.core.exception.ResourceNotFoundException; import com.azure.core.http.HttpClient; import com.azure.core.test.http.AssertingHttpClientBuilder; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.core.util.polling.SyncPoller; import com.azure.security.keyvault.secrets.implementation.KeyVaultCredentialPolicy; import com.azure.security.keyvault.secrets.implementation.models.KeyVaultErrorException; @@ -27,6 +29,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; public class SecretClientTest extends SecretClientTestBase { + private static final ClientLogger LOGGER = new ClientLogger(SecretClientTest.class); + private SecretClient secretClient; @Override @@ -494,6 +498,6 @@ private void pollOnSecretPurge(String secretName) { } } - System.err.printf("Deleted Secret %s was not purged \n", secretName); + LOGGER.log(LogLevel.VERBOSE, () -> "Deleted Secret " + secretName + " was not purged"); } } diff --git a/sdk/monitor/azure-monitor-ingestion/src/test/java/com/azure/monitor/ingestion/LogsIngestionTestBase.java b/sdk/monitor/azure-monitor-ingestion/src/test/java/com/azure/monitor/ingestion/LogsIngestionTestBase.java index eda79ce1ec45..fca9777060ae 100644 --- a/sdk/monitor/azure-monitor-ingestion/src/test/java/com/azure/monitor/ingestion/LogsIngestionTestBase.java +++ b/sdk/monitor/azure-monitor-ingestion/src/test/java/com/azure/monitor/ingestion/LogsIngestionTestBase.java @@ -19,6 +19,8 @@ import com.azure.core.test.utils.MockTokenCredential; import com.azure.core.util.BinaryData; import com.azure.core.util.Configuration; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.core.util.serializer.JsonSerializerProviders; import com.azure.core.util.serializer.TypeReference; import com.azure.identity.DefaultAzureCredentialBuilder; @@ -43,6 +45,8 @@ * Base test class for logs ingestion client tests. */ public abstract class LogsIngestionTestBase extends TestProxyTestBase { + private static final ClientLogger LOGGER = new ClientLogger(LogsIngestionTestBase.class); + protected LogsIngestionClientBuilder clientBuilder; protected String dataCollectionEndpoint; protected String dataCollectionRuleId; @@ -210,7 +214,7 @@ private static byte[] unzipRequestBody(BinaryData bodyAsBinaryData) { outputStream.close(); return outputStream.toByteArray(); } catch (IOException exception) { - System.out.println("Failed to unzip data"); + LOGGER.log(LogLevel.VERBOSE, () -> "Failed to unzip data"); } return null; } diff --git a/sdk/monitor/azure-monitor-ingestion/src/test/java/com/azure/monitor/ingestion/implementation/UtilsTest.java b/sdk/monitor/azure-monitor-ingestion/src/test/java/com/azure/monitor/ingestion/implementation/UtilsTest.java index db75340d1d7a..afc99a8bb5ab 100644 --- a/sdk/monitor/azure-monitor-ingestion/src/test/java/com/azure/monitor/ingestion/implementation/UtilsTest.java +++ b/sdk/monitor/azure-monitor-ingestion/src/test/java/com/azure/monitor/ingestion/implementation/UtilsTest.java @@ -5,7 +5,6 @@ import org.junit.jupiter.api.Test; -import java.time.Instant; import java.util.List; import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; @@ -17,7 +16,6 @@ import java.util.stream.Stream; import static org.junit.jupiter.api.Assertions.assertArrayEquals; -import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -31,13 +29,11 @@ public void shutdownHookTerminatesPool() throws InterruptedException, ExecutionE Stream stream = IntStream.of(100, 4000) .boxed() .parallel() - .map(i -> task(i)); + .map(this::task); Future> tasks = threadPool.submit(() -> stream.collect(Collectors.toList())); - long start = Instant.now().toEpochMilli(); hook.run(); - assertEquals(timeoutSec * 1000, Instant.now().toEpochMilli() - start, 1000); assertTrue(threadPool.isShutdown()); assertTrue(threadPool.isTerminated()); diff --git a/sdk/monitor/azure-monitor-opentelemetry-exporter/src/main/java/com/azure/monitor/opentelemetry/exporter/implementation/heartbeat/DefaultHeartBeatPropertyProvider.java b/sdk/monitor/azure-monitor-opentelemetry-exporter/src/main/java/com/azure/monitor/opentelemetry/exporter/implementation/heartbeat/DefaultHeartBeatPropertyProvider.java index 2a0c259da7fc..8d3c424251c7 100644 --- a/sdk/monitor/azure-monitor-opentelemetry-exporter/src/main/java/com/azure/monitor/opentelemetry/exporter/implementation/heartbeat/DefaultHeartBeatPropertyProvider.java +++ b/sdk/monitor/azure-monitor-opentelemetry-exporter/src/main/java/com/azure/monitor/opentelemetry/exporter/implementation/heartbeat/DefaultHeartBeatPropertyProvider.java @@ -23,7 +23,7 @@ public class DefaultHeartBeatPropertyProvider implements HeartBeatPayloadProvide /** * Collection holding default properties for this default provider. */ - private final Set defaultFields; + final Set defaultFields; /** * Random GUID that would help in analysis when app has stopped and restarted. Each restart will diff --git a/sdk/monitor/azure-monitor-opentelemetry-exporter/src/test/java/com/azure/monitor/opentelemetry/exporter/implementation/heartbeat/HeartbeatTests.java b/sdk/monitor/azure-monitor-opentelemetry-exporter/src/test/java/com/azure/monitor/opentelemetry/exporter/implementation/heartbeat/HeartbeatTests.java index a08c30811c66..45d3676a11fd 100644 --- a/sdk/monitor/azure-monitor-opentelemetry-exporter/src/test/java/com/azure/monitor/opentelemetry/exporter/implementation/heartbeat/HeartbeatTests.java +++ b/sdk/monitor/azure-monitor-opentelemetry-exporter/src/test/java/com/azure/monitor/opentelemetry/exporter/implementation/heartbeat/HeartbeatTests.java @@ -6,13 +6,8 @@ import com.azure.monitor.opentelemetry.exporter.implementation.models.MetricsData; import com.azure.monitor.opentelemetry.exporter.implementation.models.TelemetryItem; import org.junit.jupiter.api.Test; -import org.mockito.Mock; -import org.mockito.Mockito; -import org.mockito.stubbing.Answer; -import java.lang.reflect.Field; import java.util.List; -import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.function.Consumer; @@ -20,9 +15,8 @@ import static org.assertj.core.api.Assertions.assertThat; class HeartbeatTests { - - @Mock - private Consumer> telemetryItemsConsumer; + // Dummy consumer that does nothing. + private final Consumer> telemetryItemsConsumer = ignored -> {}; @Test void heartBeatPayloadContainsDataByDefault() throws InterruptedException { @@ -80,30 +74,24 @@ void heartbeatMetricCountsForAllFailures() { } @Test - void sentHeartbeatContainsExpectedDefaultFields() throws Exception { - HeartbeatExporter mockProvider = Mockito.mock(HeartbeatExporter.class); + void sentHeartbeatContainsExpectedDefaultFields() { ConcurrentMap props = new ConcurrentHashMap<>(); - Mockito.when( - mockProvider.addHeartBeatProperty( - Mockito.anyString(), Mockito.anyString(), Mockito.anyBoolean())) - .then( - (Answer) - invocation -> { - props.put( - invocation.getArgument(0, String.class), - invocation.getArgument(1, String.class)); - return true; - }); + + HeartbeatExporter mockProvider = new HeartbeatExporter(60, (b, r) -> { + }, telemetryItemsConsumer) { + @Override + public boolean addHeartBeatProperty(String propertyName, String propertyValue, boolean isHealthy) { + props.put(propertyName, propertyValue); + return true; + } + }; + DefaultHeartBeatPropertyProvider defaultProvider = new DefaultHeartBeatPropertyProvider(); HeartbeatDefaultPayload.populateDefaultPayload(mockProvider).run(); - Field field = defaultProvider.getClass().getDeclaredField("defaultFields"); - field.setAccessible(true); - @SuppressWarnings("unchecked") - Set defaultFields = (Set) field.get(defaultProvider); - for (String fieldName : defaultFields) { + for (String fieldName : defaultProvider.defaultFields) { assertThat(props.containsKey(fieldName)).isTrue(); - assertThat(props.get(fieldName).length() > 0).isTrue(); + assertThat(!props.get(fieldName).isEmpty()).isTrue(); } } @@ -119,15 +107,11 @@ void heartBeatProviderDoesNotAllowDuplicateProperties() { } @Test - void cannotAddUnknownDefaultProperty() throws Exception { + void cannotAddUnknownDefaultProperty() { DefaultHeartBeatPropertyProvider base = new DefaultHeartBeatPropertyProvider(); String testKey = "testKey"; - Field field = base.getClass().getDeclaredField("defaultFields"); - field.setAccessible(true); - @SuppressWarnings("unchecked") - Set defaultFields = (Set) field.get(base); - defaultFields.add(testKey); + base.defaultFields.add(testKey); HeartbeatExporter provider = new HeartbeatExporter(60, (b, r) -> { }, telemetryItemsConsumer); diff --git a/sdk/openai/azure-ai-openai-assistants/src/test/java/com/azure/ai/openai/assistants/AzureFunctionsSyncTests.java b/sdk/openai/azure-ai-openai-assistants/src/test/java/com/azure/ai/openai/assistants/AzureFunctionsSyncTests.java index 993a2317dab3..d13c415ca607 100644 --- a/sdk/openai/azure-ai-openai-assistants/src/test/java/com/azure/ai/openai/assistants/AzureFunctionsSyncTests.java +++ b/sdk/openai/azure-ai-openai-assistants/src/test/java/com/azure/ai/openai/assistants/AzureFunctionsSyncTests.java @@ -52,11 +52,7 @@ public void parallelFunctionCallTest(HttpClient httpClient, AssistantsServiceVer // Poll the run do { - try { - Thread.sleep(500); - } catch (InterruptedException e) { - throw new RuntimeException(e); - } + sleepIfRunningAgainstService(500); run = client.getRun(assistantThread.getId(), run.getId()); } while (run.getStatus() == RunStatus.QUEUED || run.getStatus() == RunStatus.IN_PROGRESS); diff --git a/sdk/openai/azure-ai-openai-assistants/src/test/java/com/azure/ai/openai/assistants/AzureRetrievalSyncTest.java b/sdk/openai/azure-ai-openai-assistants/src/test/java/com/azure/ai/openai/assistants/AzureRetrievalSyncTest.java index 372aef1d8711..e0b8132b6ee1 100644 --- a/sdk/openai/azure-ai-openai-assistants/src/test/java/com/azure/ai/openai/assistants/AzureRetrievalSyncTest.java +++ b/sdk/openai/azure-ai-openai-assistants/src/test/java/com/azure/ai/openai/assistants/AzureRetrievalSyncTest.java @@ -58,11 +58,7 @@ public void basicRetrieval(HttpClient httpClient, AssistantsServiceVersion servi ThreadRun run = client.createRun(thread, assistant); do { - try { - Thread.sleep(500); - } catch (InterruptedException e) { - throw new RuntimeException(e); - } + sleepIfRunningAgainstService(500); run = client.getRun(thread.getId(), run.getId()); } while (run.getStatus() == RunStatus.IN_PROGRESS || run.getStatus() == RunStatus.QUEUED); diff --git a/sdk/openai/azure-ai-openai-assistants/src/test/java/com/azure/ai/openai/assistants/AzureRunThreadAsyncTest.java b/sdk/openai/azure-ai-openai-assistants/src/test/java/com/azure/ai/openai/assistants/AzureRunThreadAsyncTest.java index c303e758c988..0c41110a5607 100644 --- a/sdk/openai/azure-ai-openai-assistants/src/test/java/com/azure/ai/openai/assistants/AzureRunThreadAsyncTest.java +++ b/sdk/openai/azure-ai-openai-assistants/src/test/java/com/azure/ai/openai/assistants/AzureRunThreadAsyncTest.java @@ -69,11 +69,7 @@ public void submitMessageAndRun(HttpClient httpClient, AssistantsServiceVersion .verifyComplete(); run = runReference.get(); - try { - Thread.sleep(500); - } catch (InterruptedException e) { - throw new RuntimeException(e); - } + sleepIfRunningAgainstService(500); } while (run.getStatus() == RunStatus.IN_PROGRESS || run.getStatus() == RunStatus.QUEUED); assertSame(RunStatus.COMPLETED, run.getStatus()); @@ -136,11 +132,7 @@ public void submitMessageAndRunWithResponse(HttpClient httpClient, AssistantsSer .verifyComplete(); run = runReference.get(); - try { - Thread.sleep(500); - } catch (InterruptedException e) { - throw new RuntimeException(e); - } + sleepIfRunningAgainstService(500); } while (run.getStatus() == RunStatus.IN_PROGRESS || run.getStatus() == RunStatus.QUEUED); assertSame(RunStatus.COMPLETED, run.getStatus()); @@ -196,11 +188,7 @@ public void createThreadAndRun(HttpClient httpClient, AssistantsServiceVersion s .verifyComplete(); run = runReference.get(); - try { - Thread.sleep(500); - } catch (InterruptedException e) { - throw new RuntimeException(e); - } + sleepIfRunningAgainstService(500); } while (run.getStatus() == RunStatus.IN_PROGRESS || run.getStatus() == RunStatus.QUEUED); assertSame(RunStatus.COMPLETED, run.getStatus()); @@ -261,11 +249,7 @@ public void createThreadAndRunWithResponse(HttpClient httpClient, AssistantsServ .verifyComplete(); run = runReference.get(); - try { - Thread.sleep(500); - } catch (InterruptedException e) { - throw new RuntimeException(e); - } + sleepIfRunningAgainstService(500); } while (run.getStatus() == RunStatus.IN_PROGRESS || run.getStatus() == RunStatus.QUEUED); assertSame(RunStatus.COMPLETED, run.getStatus()); @@ -394,11 +378,7 @@ public void listAndGetRunSteps(HttpClient httpClient, AssistantsServiceVersion s runReference.set(threadRun); }) .verifyComplete(); - try { - Thread.sleep(500); - } catch (InterruptedException e) { - throw new RuntimeException(e); - } + sleepIfRunningAgainstService(500); run = runReference.get(); } while (run.getStatus() == RunStatus.IN_PROGRESS || run.getStatus() == RunStatus.QUEUED); assertSame(RunStatus.COMPLETED, run.getStatus()); diff --git a/sdk/openai/azure-ai-openai-assistants/src/test/java/com/azure/ai/openai/assistants/AzureRunThreadSyncTest.java b/sdk/openai/azure-ai-openai-assistants/src/test/java/com/azure/ai/openai/assistants/AzureRunThreadSyncTest.java index ce08fa777d93..5ea7a4570741 100644 --- a/sdk/openai/azure-ai-openai-assistants/src/test/java/com/azure/ai/openai/assistants/AzureRunThreadSyncTest.java +++ b/sdk/openai/azure-ai-openai-assistants/src/test/java/com/azure/ai/openai/assistants/AzureRunThreadSyncTest.java @@ -50,11 +50,7 @@ public void submitMessageAndRun(HttpClient httpClient, AssistantsServiceVersion // Wait on Run and poll the Run in a loop do { run = client.getRun(run.getThreadId(), run.getId()); - try { - Thread.sleep(500); - } catch (InterruptedException e) { - throw new RuntimeException(e); - } + sleepIfRunningAgainstService(500); } while (run.getStatus() == RunStatus.IN_PROGRESS || run.getStatus() == RunStatus.QUEUED); assertSame(RunStatus.COMPLETED, run.getStatus()); @@ -94,11 +90,7 @@ public void submitMessageAndRunWithResponse(HttpClient httpClient, AssistantsSer // Wait on Run and poll the Run in a loop do { run = client.getRun(run.getThreadId(), run.getId()); - try { - Thread.sleep(500); - } catch (InterruptedException e) { - throw new RuntimeException(e); - } + sleepIfRunningAgainstService(500); } while (run.getStatus() == RunStatus.IN_PROGRESS || run.getStatus() == RunStatus.QUEUED); assertSame(RunStatus.COMPLETED, run.getStatus()); @@ -134,11 +126,7 @@ public void createThreadAndRun(HttpClient httpClient, AssistantsServiceVersion s // Wait on Run and poll the Run in a loop do { run = client.getRun(run.getThreadId(), run.getId()); - try { - Thread.sleep(500); - } catch (InterruptedException e) { - throw new RuntimeException(e); - } + sleepIfRunningAgainstService(500); } while (run.getStatus() == RunStatus.IN_PROGRESS || run.getStatus() == RunStatus.QUEUED); assertSame(RunStatus.COMPLETED, run.getStatus()); @@ -176,11 +164,7 @@ public void createThreadAndRunWithResponse(HttpClient httpClient, AssistantsServ // Wait on Run and poll the Run in a loop do { run = client.getRun(run.getThreadId(), run.getId()); - try { - Thread.sleep(500); - } catch (InterruptedException e) { - throw new RuntimeException(e); - } + sleepIfRunningAgainstService(500); } while (run.getStatus() == RunStatus.IN_PROGRESS || run.getStatus() == RunStatus.QUEUED); assertSame(RunStatus.COMPLETED, run.getStatus()); @@ -283,11 +267,7 @@ public void listAndGetRunSteps(HttpClient httpClient, AssistantsServiceVersion s // Wait on Run and poll the Run in a loop do { run = client.getRun(run.getThreadId(), run.getId()); - try { - Thread.sleep(500); - } catch (InterruptedException e) { - throw new RuntimeException(e); - } + sleepIfRunningAgainstService(500); } while (run.getStatus() == RunStatus.IN_PROGRESS || run.getStatus() == RunStatus.QUEUED); assertSame(RunStatus.COMPLETED, run.getStatus()); diff --git a/sdk/openai/azure-ai-openai-assistants/src/test/java/com/azure/ai/openai/assistants/FunctionsSyncTests.java b/sdk/openai/azure-ai-openai-assistants/src/test/java/com/azure/ai/openai/assistants/FunctionsSyncTests.java index 50182c461a08..231da68f7344 100644 --- a/sdk/openai/azure-ai-openai-assistants/src/test/java/com/azure/ai/openai/assistants/FunctionsSyncTests.java +++ b/sdk/openai/azure-ai-openai-assistants/src/test/java/com/azure/ai/openai/assistants/FunctionsSyncTests.java @@ -52,11 +52,7 @@ public void parallelFunctionCallTest(HttpClient httpClient, AssistantsServiceVer // Poll the run do { - try { - Thread.sleep(500); - } catch (InterruptedException e) { - throw new RuntimeException(e); - } + sleepIfRunningAgainstService(500); run = client.getRun(assistantThread.getId(), run.getId()); } while (run.getStatus() == RunStatus.QUEUED || run.getStatus() == RunStatus.IN_PROGRESS); diff --git a/sdk/openai/azure-ai-openai-assistants/src/test/java/com/azure/ai/openai/assistants/RetrievalSyncTest.java b/sdk/openai/azure-ai-openai-assistants/src/test/java/com/azure/ai/openai/assistants/RetrievalSyncTest.java index e9ad5a5fd64f..3ab9b625ba3e 100644 --- a/sdk/openai/azure-ai-openai-assistants/src/test/java/com/azure/ai/openai/assistants/RetrievalSyncTest.java +++ b/sdk/openai/azure-ai-openai-assistants/src/test/java/com/azure/ai/openai/assistants/RetrievalSyncTest.java @@ -56,11 +56,7 @@ public void basicRetrieval(HttpClient httpClient, AssistantsServiceVersion servi ThreadRun run = client.createRun(thread, assistant); do { - try { - Thread.sleep(500); - } catch (InterruptedException e) { - throw new RuntimeException(e); - } + sleepIfRunningAgainstService(500); run = client.getRun(thread.getId(), run.getId()); } while (run.getStatus() == RunStatus.IN_PROGRESS || run.getStatus() == RunStatus.QUEUED); diff --git a/sdk/openai/azure-ai-openai-assistants/src/test/java/com/azure/ai/openai/assistants/RunThreadAsyncTest.java b/sdk/openai/azure-ai-openai-assistants/src/test/java/com/azure/ai/openai/assistants/RunThreadAsyncTest.java index 035e80e9a8ff..fc56f839db04 100644 --- a/sdk/openai/azure-ai-openai-assistants/src/test/java/com/azure/ai/openai/assistants/RunThreadAsyncTest.java +++ b/sdk/openai/azure-ai-openai-assistants/src/test/java/com/azure/ai/openai/assistants/RunThreadAsyncTest.java @@ -69,11 +69,7 @@ public void submitMessageAndRun(HttpClient httpClient, AssistantsServiceVersion .verifyComplete(); run = runReference.get(); - try { - Thread.sleep(500); - } catch (InterruptedException e) { - throw new RuntimeException(e); - } + sleepIfRunningAgainstService(500); } while (run.getStatus() == RunStatus.IN_PROGRESS || run.getStatus() == RunStatus.QUEUED); assertSame(RunStatus.COMPLETED, run.getStatus()); @@ -138,11 +134,7 @@ public void submitMessageAndRunWithResponse(HttpClient httpClient, AssistantsSer .verifyComplete(); run = runReference.get(); - try { - Thread.sleep(500); - } catch (InterruptedException e) { - throw new RuntimeException(e); - } + sleepIfRunningAgainstService(500); } while (run.getStatus() == RunStatus.IN_PROGRESS || run.getStatus() == RunStatus.QUEUED); assertSame(RunStatus.COMPLETED, run.getStatus()); @@ -198,11 +190,7 @@ public void createThreadAndRun(HttpClient httpClient, AssistantsServiceVersion s .verifyComplete(); run = runReference.get(); - try { - Thread.sleep(500); - } catch (InterruptedException e) { - throw new RuntimeException(e); - } + sleepIfRunningAgainstService(500); } while (run.getStatus() == RunStatus.IN_PROGRESS || run.getStatus() == RunStatus.QUEUED); assertSame(RunStatus.COMPLETED, run.getStatus()); @@ -263,11 +251,7 @@ public void createThreadAndRunWithResponse(HttpClient httpClient, AssistantsServ .verifyComplete(); run = runReference.get(); - try { - Thread.sleep(500); - } catch (InterruptedException e) { - throw new RuntimeException(e); - } + sleepIfRunningAgainstService(500); } while (run.getStatus() == RunStatus.IN_PROGRESS || run.getStatus() == RunStatus.QUEUED); assertSame(RunStatus.COMPLETED, run.getStatus()); @@ -396,11 +380,7 @@ public void listAndGetRunSteps(HttpClient httpClient, AssistantsServiceVersion s runReference.set(threadRun); }) .verifyComplete(); - try { - Thread.sleep(500); - } catch (InterruptedException e) { - throw new RuntimeException(e); - } + sleepIfRunningAgainstService(500); run = runReference.get(); } while (run.getStatus() == RunStatus.IN_PROGRESS || run.getStatus() == RunStatus.QUEUED); assertSame(RunStatus.COMPLETED, run.getStatus()); diff --git a/sdk/openai/azure-ai-openai-assistants/src/test/java/com/azure/ai/openai/assistants/RunThreadSyncTest.java b/sdk/openai/azure-ai-openai-assistants/src/test/java/com/azure/ai/openai/assistants/RunThreadSyncTest.java index 294165e1d156..1cf4ddf547b3 100644 --- a/sdk/openai/azure-ai-openai-assistants/src/test/java/com/azure/ai/openai/assistants/RunThreadSyncTest.java +++ b/sdk/openai/azure-ai-openai-assistants/src/test/java/com/azure/ai/openai/assistants/RunThreadSyncTest.java @@ -50,11 +50,7 @@ public void submitMessageAndRun(HttpClient httpClient, AssistantsServiceVersion // Wait on Run and poll the Run in a loop do { run = client.getRun(run.getThreadId(), run.getId()); - try { - Thread.sleep(500); - } catch (InterruptedException e) { - throw new RuntimeException(e); - } + sleepIfRunningAgainstService(500); } while (run.getStatus() == RunStatus.IN_PROGRESS || run.getStatus() == RunStatus.QUEUED); assertSame(RunStatus.COMPLETED, run.getStatus()); @@ -94,11 +90,7 @@ public void submitMessageAndRunWithResponse(HttpClient httpClient, AssistantsSer // Wait on Run and poll the Run in a loop do { run = client.getRun(run.getThreadId(), run.getId()); - try { - Thread.sleep(500); - } catch (InterruptedException e) { - throw new RuntimeException(e); - } + sleepIfRunningAgainstService(500); } while (run.getStatus() == RunStatus.IN_PROGRESS || run.getStatus() == RunStatus.QUEUED); assertSame(RunStatus.COMPLETED, run.getStatus()); @@ -133,11 +125,7 @@ public void createThreadAndRun(HttpClient httpClient, AssistantsServiceVersion s // Wait on Run and poll the Run in a loop do { run = client.getRun(run.getThreadId(), run.getId()); - try { - Thread.sleep(500); - } catch (InterruptedException e) { - throw new RuntimeException(e); - } + sleepIfRunningAgainstService(500); } while (run.getStatus() == RunStatus.IN_PROGRESS || run.getStatus() == RunStatus.QUEUED); assertSame(RunStatus.COMPLETED, run.getStatus()); @@ -175,11 +163,7 @@ public void createThreadAndRunWithResponse(HttpClient httpClient, AssistantsServ // Wait on Run and poll the Run in a loop do { run = client.getRun(run.getThreadId(), run.getId()); - try { - Thread.sleep(500); - } catch (InterruptedException e) { - throw new RuntimeException(e); - } + sleepIfRunningAgainstService(500); } while (run.getStatus() == RunStatus.IN_PROGRESS || run.getStatus() == RunStatus.QUEUED); assertSame(RunStatus.COMPLETED, run.getStatus()); @@ -281,11 +265,7 @@ public void listAndGetRunSteps(HttpClient httpClient, AssistantsServiceVersion s // Wait on Run and poll the Run in a loop do { run = client.getRun(run.getThreadId(), run.getId()); - try { - Thread.sleep(500); - } catch (InterruptedException e) { - throw new RuntimeException(e); - } + sleepIfRunningAgainstService(500); } while (run.getStatus() == RunStatus.IN_PROGRESS || run.getStatus() == RunStatus.QUEUED); assertSame(RunStatus.COMPLETED, run.getStatus()); diff --git a/sdk/quantum/azure-quantum-jobs/src/test/java/com/azure/quantum/jobs/QuantumClientTestBase.java b/sdk/quantum/azure-quantum-jobs/src/test/java/com/azure/quantum/jobs/QuantumClientTestBase.java index 2299df6ca4a2..046f8777b2d0 100644 --- a/sdk/quantum/azure-quantum-jobs/src/test/java/com/azure/quantum/jobs/QuantumClientTestBase.java +++ b/sdk/quantum/azure-quantum-jobs/src/test/java/com/azure/quantum/jobs/QuantumClientTestBase.java @@ -15,9 +15,13 @@ import com.azure.core.test.models.TestProxySanitizer; import com.azure.core.test.models.TestProxySanitizerType; import com.azure.core.util.Configuration; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.identity.DefaultAzureCredentialBuilder; public class QuantumClientTestBase extends TestProxyTestBase { + private static final ClientLogger LOGGER = new ClientLogger(QuantumClientTestBase.class); + private final String SANITIZED = "Sanitized"; private final String SUBSCRIPTION_ID = "00000000-0000-0000-0000-000000000000"; private final String RESOURCE_GROUP = "myresourcegroup"; @@ -27,12 +31,12 @@ public class QuantumClientTestBase extends TestProxyTestBase { QuantumClientBuilder getClientBuilder(HttpClient httpClient) { - System.out.println(String.format("Subscription id: %s", getSubscriptionId())); - System.out.println(String.format("Resource group: %s", getResourceGroup())); - System.out.println(String.format("Workspace: %s", getWorkspaceName())); - System.out.println(String.format("Location: %s", getLocation())); - System.out.println(String.format("Endpoint: %s", getEndpoint())); - System.out.println(String.format("Test mode: %s", getTestMode())); + LOGGER.log(LogLevel.VERBOSE, () -> "Subscription id: " + getSubscriptionId()); + LOGGER.log(LogLevel.VERBOSE, () -> "Resource group: " + getResourceGroup()); + LOGGER.log(LogLevel.VERBOSE, () -> "Workspace: " + getWorkspaceName()); + LOGGER.log(LogLevel.VERBOSE, () -> "Location: " + getLocation()); + LOGGER.log(LogLevel.VERBOSE, () -> "Endpoint: " + getEndpoint()); + LOGGER.log(LogLevel.VERBOSE, () -> "Test mode: " + getTestMode()); QuantumClientBuilder builder = new QuantumClientBuilder(); diff --git a/sdk/resourcemanager/azure-resourcemanager-appplatform/src/test/java/com/azure/resourcemanager/appplatform/AppPlatformTest.java b/sdk/resourcemanager/azure-resourcemanager-appplatform/src/test/java/com/azure/resourcemanager/appplatform/AppPlatformTest.java index e296384651bd..812417c877c2 100644 --- a/sdk/resourcemanager/azure-resourcemanager-appplatform/src/test/java/com/azure/resourcemanager/appplatform/AppPlatformTest.java +++ b/sdk/resourcemanager/azure-resourcemanager-appplatform/src/test/java/com/azure/resourcemanager/appplatform/AppPlatformTest.java @@ -10,6 +10,8 @@ import com.azure.core.http.policy.HttpPipelinePolicy; import com.azure.core.http.policy.RetryPolicy; import com.azure.core.management.profile.AzureProfile; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.resourcemanager.appservice.AppServiceManager; import com.azure.resourcemanager.dns.DnsZoneManager; import com.azure.resourcemanager.keyvault.KeyVaultManager; @@ -33,6 +35,8 @@ import java.util.List; public class AppPlatformTest extends ResourceManagerTestProxyTestBase { + private static final ClientLogger LOGGER = new ClientLogger(AppPlatformTest.class); + protected AppPlatformManager appPlatformManager; protected AppServiceManager appServiceManager; protected DnsZoneManager dnsZoneManager; @@ -85,10 +89,10 @@ protected boolean checkRedirect(String url) throws IOException { if (connection.getResponseCode() / 100 == 3) { return true; } - System.out.printf("Do request to %s with response code %d%n", url, connection.getResponseCode()); + LOGGER.verbose("Do request to {} with response code {}", url, connection.getResponseCode()); } } catch (Exception e) { - System.err.printf("Do request to %s with error %s%n", url, e.getMessage()); + LOGGER.log(LogLevel.VERBOSE, () -> "Do request to " + url + " with error", e); } finally { connection.disconnect(); } @@ -103,13 +107,13 @@ protected boolean requestSuccess(String url) throws Exception { try { connection.connect(); if (connection.getResponseCode() == 200) { - System.out.printf("Request to %s succeeded%n", url); + LOGGER.log(LogLevel.VERBOSE, () -> "Request to " + url + " succeeded"); connection.getInputStream().close(); return true; } - System.out.printf("Do request to %s with response code %d%n", url, connection.getResponseCode()); + LOGGER.verbose("Do request to {} with response code {}", url, connection.getResponseCode()); } catch (Exception e) { - System.err.printf("Do request to %s with error %s%n", url, e.getMessage()); + LOGGER.log(LogLevel.VERBOSE, () -> "Do request to " + url + " with error", e); } finally { connection.disconnect(); } diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/java/com/azure/resourcemanager/appservice/OneDeployTests.java b/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/java/com/azure/resourcemanager/appservice/OneDeployTests.java index 1d86fb736472..066f8aaf5346 100644 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/java/com/azure/resourcemanager/appservice/OneDeployTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/java/com/azure/resourcemanager/appservice/OneDeployTests.java @@ -96,7 +96,7 @@ public void canPushDeployJar() throws Exception { Assertions.assertNotNull(deploymentId); // stream logs - webApp1.streamApplicationLogsAsync().subscribeOn(Schedulers.single()).subscribe(System.out::println); + webApp1.streamApplicationLogsAsync().subscribeOn(Schedulers.single()).subscribe(LOGGER::verbose); waitForRuntimeSuccess(webApp1, deploymentId); diff --git a/sdk/resourcemanager/azure-resourcemanager-authorization/src/test/java/com/azure/resourcemanager/authorization/implementation/RetryTests.java b/sdk/resourcemanager/azure-resourcemanager-authorization/src/test/java/com/azure/resourcemanager/authorization/implementation/RetryTests.java index fdb1ce8debff..3e50a823425b 100644 --- a/sdk/resourcemanager/azure-resourcemanager-authorization/src/test/java/com/azure/resourcemanager/authorization/implementation/RetryTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-authorization/src/test/java/com/azure/resourcemanager/authorization/implementation/RetryTests.java @@ -6,6 +6,8 @@ import com.azure.core.http.HttpResponse; import com.azure.core.management.exception.ManagementError; import com.azure.core.management.exception.ManagementException; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.resourcemanager.resources.fluentcore.utils.ResourceManagerUtils; import com.azure.resourcemanager.test.utils.TestDelayProvider; import org.junit.jupiter.api.Assertions; @@ -19,6 +21,7 @@ import java.util.concurrent.atomic.AtomicInteger; public class RetryTests { + private static final ClientLogger LOGGER = new ClientLogger(RetryTests.class); @Test public void testRetryForGraph() { @@ -33,9 +36,8 @@ public void testRetryForGraph() { RetryBackoffSpec retry = RetryUtils.backoffRetryFor404ResourceNotFound(); AtomicInteger retryCount = new AtomicInteger(0); - retry = retry.doAfterRetry(ignored -> { - System.out.println("retry " + retryCount.incrementAndGet() + ", at " + OffsetDateTime.now()); - }); + retry = retry.doAfterRetry(ignored -> LOGGER.log(LogLevel.VERBOSE, + () -> "retry " + retryCount.incrementAndGet() + ", at " + OffsetDateTime.now())); // pass without retry Mono monoSuccess = Mono.just("foo"); @@ -106,9 +108,8 @@ public void testRetryForAuthorization() { RetryBackoffSpec retry = RetryUtils.backoffRetryFor400PrincipalNotFound(); AtomicInteger retryCount = new AtomicInteger(0); - retry = retry.doAfterRetry(ignored -> { - System.out.println("retry " + retryCount.incrementAndGet() + ", at " + OffsetDateTime.now()); - }); + retry = retry.doAfterRetry(ignored -> LOGGER.log(LogLevel.VERBOSE, + () -> "retry " + retryCount.incrementAndGet() + ", at " + OffsetDateTime.now())); // 400 with PrincipalNotFound, retry till pass AtomicInteger errorCount = new AtomicInteger(0); diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineImageOperationsTests.java b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineImageOperationsTests.java index 770a9dbbf94c..c6cead94f558 100644 --- a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineImageOperationsTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineImageOperationsTests.java @@ -4,6 +4,8 @@ package com.azure.resourcemanager.compute; import com.azure.core.http.rest.PagedIterable; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.resourcemanager.compute.models.DataDiskImage; import com.azure.resourcemanager.compute.models.VirtualMachineImage; import com.azure.resourcemanager.compute.models.VirtualMachineOffer; @@ -14,6 +16,8 @@ import org.junit.jupiter.api.Test; public class VirtualMachineImageOperationsTests extends ComputeManagementTest { + private static final ClientLogger LOGGER = new ClientLogger(VirtualMachineImageOperationsTests.class); + @Test public void canListVirtualMachineImages() throws Exception { /* @@ -37,7 +41,7 @@ public void canListVirtualMachineImages() throws Exception { for (VirtualMachineOffer offer : canonicalPublisher.offers().list()) { for (VirtualMachineSku sku : offer.skus().list()) { for (VirtualMachineImage image : sku.images().list()) { - System.out.println(image.version()); + LOGGER.log(LogLevel.VERBOSE, image::version); firstVMImage = image; break; } diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineManagedDiskOperationsTests.java b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineManagedDiskOperationsTests.java index e514f890fea4..d8e3d7ae823a 100644 --- a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineManagedDiskOperationsTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineManagedDiskOperationsTests.java @@ -4,6 +4,8 @@ package com.azure.resourcemanager.compute; import com.azure.core.http.HttpPipeline; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.resourcemanager.compute.models.AvailabilitySet; import com.azure.resourcemanager.compute.models.AvailabilitySetSkuTypes; import com.azure.resourcemanager.compute.models.CachingTypes; @@ -28,6 +30,8 @@ import org.junit.jupiter.api.Test; public class VirtualMachineManagedDiskOperationsTests extends ComputeManagementTest { + private static final ClientLogger LOGGER = new ClientLogger(VirtualMachineManagedDiskOperationsTests.class); + private String rgName = ""; private Region region = Region.US_EAST; private KnownLinuxVirtualMachineImage linuxImage = KnownLinuxVirtualMachineImage.UBUNTU_SERVER_16_04_LTS; @@ -314,7 +318,7 @@ public void canCreateVirtualMachineFromCustomImageWithManagedDisks() { .withSize(VirtualMachineSizeTypes.fromString("Standard_D4a_v4")) .withOSDiskCaching(CachingTypes.READ_WRITE) .create(); - System.out.println("Waiting for some time before de-provision"); + LOGGER.log(LogLevel.VERBOSE, () -> "Waiting for some time before de-provision"); sleep(60 * 1000); // Wait for some time to ensure vm is publicly accessible deprovisionAgentInLinuxVM(virtualMachine1); diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineOperationsTests.java b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineOperationsTests.java index f6acacb5f6b4..6dbbc6ab4f03 100644 --- a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineOperationsTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineOperationsTests.java @@ -13,6 +13,8 @@ import com.azure.core.test.annotation.DoNotRecord; import com.azure.core.util.Context; import com.azure.core.util.CoreUtils; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.core.util.polling.LongRunningOperationStatus; import com.azure.core.util.polling.PollResponse; import com.azure.resourcemanager.compute.fluent.models.VirtualMachineInner; @@ -82,6 +84,8 @@ import java.util.concurrent.atomic.AtomicInteger; public class VirtualMachineOperationsTests extends ComputeManagementTest { + private static final ClientLogger LOGGER = new ClientLogger(VirtualMachineOperationsTests.class); + private String rgName = ""; private String rgName2 = ""; private final Region region = Region.US_EAST; @@ -731,7 +735,7 @@ public void canStreamParallelCreatedVirtualMachinesAndRelatedResources() throws createdResource -> { if (createdResource instanceof Resource) { Resource resource = (Resource) createdResource; - System.out.println("Created: " + resource.id()); + LOGGER.log(LogLevel.VERBOSE, () -> "Created: " + resource.id()); if (resource instanceof VirtualMachine) { VirtualMachine virtualMachine = (VirtualMachine) resource; Assertions.assertTrue(virtualMachineNames.contains(virtualMachine.name())); diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineRelatedResourcesDeletionTests.java b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineRelatedResourcesDeletionTests.java index aaf5daeb295a..0f72c477a604 100644 --- a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineRelatedResourcesDeletionTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineRelatedResourcesDeletionTests.java @@ -6,6 +6,8 @@ import com.azure.core.http.HttpPipeline; import com.azure.core.management.exception.ManagementException; import com.azure.core.test.annotation.DoNotRecord; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.resourcemanager.compute.models.AvailabilitySet; import com.azure.resourcemanager.compute.models.KnownLinuxVirtualMachineImage; import com.azure.resourcemanager.compute.models.VirtualMachine; @@ -31,6 +33,7 @@ import reactor.core.publisher.Mono; public class VirtualMachineRelatedResourcesDeletionTests extends ComputeManagementTest { + private static final ClientLogger LOGGER = new ClientLogger(VirtualMachineRelatedResourcesDeletionTests.class); private String rgName = ""; @@ -166,7 +169,7 @@ public void canDeleteRelatedResourcesFromFailedParallelVMCreations() { createdResource -> { if (createdResource instanceof Resource) { Resource resource = (Resource) createdResource; - System.out.println("Created: " + resource.id()); + LOGGER.log(LogLevel.VERBOSE, () -> "Created: " + resource.id()); if (resource instanceof VirtualMachine) { VirtualMachine virtualMachine = (VirtualMachine) resource; @@ -220,22 +223,23 @@ public void canDeleteRelatedResourcesFromFailedParallelVMCreations() { // Show any errors for (Throwable error : errors) { - System.out.println("\n### ERROR ###\n"); + LOGGER.log(LogLevel.VERBOSE, () -> "\n### ERROR ###\n"); if (error instanceof ManagementException) { ManagementException ce = (ManagementException) error; - System.out.println("CLOUD EXCEPTION: " + ce.getMessage()); + LOGGER.log(LogLevel.VERBOSE, () -> "CLOUD EXCEPTION: " + ce.getMessage()); } else { - error.printStackTrace(); + LOGGER.log(LogLevel.VERBOSE, () -> "Only expected ManagementExceptions", error); } } - System.out.println("Number of failed/cleaned up VM creations: " + vmNonNicResourceDefinitions.size()); + LOGGER.log(LogLevel.VERBOSE, + () -> "Number of failed/cleaned up VM creations: " + vmNonNicResourceDefinitions.size()); // Verifications final int successfulVMCount = desiredVMCount - vmNonNicResourceDefinitions.size(); final int actualVMCount = TestUtilities.getSize(computeManager.virtualMachines().listByResourceGroup(resourceGroupName)); - System.out.println("Number of actual successful VMs: " + actualVMCount); + LOGGER.log(LogLevel.VERBOSE, () -> "Number of actual successful VMs: " + actualVMCount); Assertions.assertEquals(successfulVMCount, actualVMCount); final int actualNicCount = diff --git a/sdk/resourcemanager/azure-resourcemanager-containerservice/src/test/java/com/azure/resourcemanager/containerservice/KubernetesClustersTests.java b/sdk/resourcemanager/azure-resourcemanager-containerservice/src/test/java/com/azure/resourcemanager/containerservice/KubernetesClustersTests.java index f7a3930a4ef3..66b802421cb9 100644 --- a/sdk/resourcemanager/azure-resourcemanager-containerservice/src/test/java/com/azure/resourcemanager/containerservice/KubernetesClustersTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-containerservice/src/test/java/com/azure/resourcemanager/containerservice/KubernetesClustersTests.java @@ -7,6 +7,8 @@ import com.azure.core.http.policy.AddHeadersFromContextPolicy; import com.azure.core.util.Context; import com.azure.core.util.CoreUtils; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.resourcemanager.containerservice.models.AgentPool; import com.azure.resourcemanager.containerservice.models.AgentPoolData; import com.azure.resourcemanager.containerservice.models.AgentPoolMode; @@ -48,6 +50,8 @@ import java.util.stream.Collectors; public class KubernetesClustersTests extends ContainerServiceManagementTest { + private static final ClientLogger LOGGER = new ClientLogger(KubernetesClustersTests.class); + private static final String SSH_KEY = sshPublicKey(); @Test @@ -256,7 +260,8 @@ public void canAutoScaleKubernetesCluster() { .create(); // print config - System.out.println(new String(kubernetesCluster.adminKubeConfigContent(), StandardCharsets.UTF_8)); + LOGGER.log(LogLevel.VERBOSE, + () -> new String(kubernetesCluster.adminKubeConfigContent(), StandardCharsets.UTF_8)); Assertions.assertEquals(Code.RUNNING, kubernetesCluster.powerState().code()); @@ -335,7 +340,8 @@ public void canCreateClusterWithSpotVM() { .create(); // print config - System.out.println(new String(kubernetesCluster.adminKubeConfigContent(), StandardCharsets.UTF_8)); + LOGGER.log(LogLevel.VERBOSE, + () -> new String(kubernetesCluster.adminKubeConfigContent(), StandardCharsets.UTF_8)); KubernetesClusterAgentPool agentPoolProfile = kubernetesCluster.agentPools().get(agentPoolName); Assertions.assertTrue(agentPoolProfile.virtualMachinePriority() == null || agentPoolProfile.virtualMachinePriority() == ScaleSetPriority.REGULAR); diff --git a/sdk/resourcemanager/azure-resourcemanager-monitor/src/test/java/com/azure/resourcemanager/monitor/MonitorActivityAndMetricsTests.java b/sdk/resourcemanager/azure-resourcemanager-monitor/src/test/java/com/azure/resourcemanager/monitor/MonitorActivityAndMetricsTests.java index 83d9d1561a15..dee1fa063b69 100644 --- a/sdk/resourcemanager/azure-resourcemanager-monitor/src/test/java/com/azure/resourcemanager/monitor/MonitorActivityAndMetricsTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-monitor/src/test/java/com/azure/resourcemanager/monitor/MonitorActivityAndMetricsTests.java @@ -9,6 +9,8 @@ import com.azure.core.management.exception.ManagementException; import com.azure.core.management.profile.AzureProfile; import com.azure.core.test.annotation.DoNotRecord; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.resourcemanager.compute.models.VirtualMachine; import com.azure.resourcemanager.monitor.models.EventData; import com.azure.resourcemanager.monitor.models.EventDataPropertyName; @@ -24,6 +26,8 @@ import java.time.OffsetDateTime; public class MonitorActivityAndMetricsTests extends MonitorManagementTest { + private static final ClientLogger LOGGER = new ClientLogger(MonitorActivityAndMetricsTests.class); + private String rgName = ""; @Override protected void initializeClients(HttpPipeline httpPipeline, AzureProfile profile) { @@ -49,7 +53,7 @@ public void canListEventsAndMetrics() { "10.0.0.0/28"); OffsetDateTime now = OffsetDateTime.now(); - System.out.println("record timestamp: " + now); + LOGGER.log(LogLevel.VERBOSE, () -> "record timestamp: " + now); OffsetDateTime recordDateTime = now.minusDays(40); @@ -143,7 +147,7 @@ public void canListEventsAndMetricsWithWhiteSpaceInResourceId() { SqlElasticPool pool = ensureElasticPoolWithWhiteSpace(region, rgName); OffsetDateTime now = OffsetDateTime.now(); - System.out.println("record timestamp: " + now); + LOGGER.log(LogLevel.VERBOSE, () -> "record timestamp: " + now); OffsetDateTime recordDateTime = now.minusDays(40); diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/DeploymentsTests.java b/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/DeploymentsTests.java index d81b0ab2e248..a4c355636f15 100644 --- a/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/DeploymentsTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/DeploymentsTests.java @@ -10,6 +10,8 @@ import com.azure.core.management.exception.ManagementError; import com.azure.core.management.exception.ManagementException; import com.azure.core.util.Context; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.core.util.polling.LongRunningOperationStatus; import com.azure.core.util.polling.PollResponse; import com.azure.resourcemanager.test.utils.TestUtilities; @@ -38,6 +40,8 @@ import java.util.stream.Collectors; public class DeploymentsTests extends ResourceManagementTest { + private static final ClientLogger LOGGER = new ClientLogger(DeploymentsTests.class); + private ResourceGroups resourceGroups; private ResourceGroup resourceGroup; @@ -446,7 +450,7 @@ public void canDeployVirtualNetworkWithContext() { try { String correlationRequestId = generateRandomUuid(); - System.out.println("x-ms-correlation-request-id: " + correlationRequestId); + LOGGER.log(LogLevel.VERBOSE, () -> "x-ms-correlation-request-id: " + correlationRequestId); Context context = new Context( AddHeadersFromContextPolicy.AZURE_REQUEST_HTTP_HEADERS_KEY, new HttpHeaders().set("x-ms-correlation-request-id", correlationRequestId)); diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/fluentcore/dag/BreadSliceImpl.java b/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/fluentcore/dag/BreadSliceImpl.java index 4ce5407d2550..e2d2e643964b 100644 --- a/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/fluentcore/dag/BreadSliceImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/fluentcore/dag/BreadSliceImpl.java @@ -3,6 +3,8 @@ package com.azure.resourcemanager.resources.fluentcore.dag; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.resourcemanager.resources.fluentcore.model.Creatable; import com.azure.resourcemanager.resources.fluentcore.model.Executable; import com.azure.resourcemanager.resources.fluentcore.model.implementation.ExecutableImpl; @@ -14,6 +16,8 @@ * Implementation for IBreadSlice. */ public class BreadSliceImpl extends ExecutableImpl implements IBreadSlice { + private static final ClientLogger LOGGER = new ClientLogger(BreadSliceImpl.class); + private final String name; public BreadSliceImpl(String name) { @@ -23,7 +27,7 @@ public BreadSliceImpl(String name) { @Override public Mono executeWorkAsync() { - System.out.println("Bread(" + this.name + ")::executeWorkAsync() [Getting slice from store]"); + LOGGER.log(LogLevel.VERBOSE, () -> "Bread(" + this.name + ")::executeWorkAsync() [Getting slice from store]"); return Mono.just(this) .delayElement(Duration.ofMillis(250)) .map(breadSlice -> breadSlice); diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/fluentcore/dag/DAGErrorTests.java b/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/fluentcore/dag/DAGErrorTests.java index 6d8b11398cb9..4df71ac7a2c5 100644 --- a/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/fluentcore/dag/DAGErrorTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/fluentcore/dag/DAGErrorTests.java @@ -3,6 +3,8 @@ package com.azure.resourcemanager.resources.fluentcore.dag; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import reactor.core.publisher.Mono; @@ -14,6 +16,8 @@ import java.util.TreeSet; public class DAGErrorTests { + private static final ClientLogger LOGGER = new ClientLogger(DAGErrorTests.class); + @Test public void testTerminateOnInProgressTaskCompletion() { // Terminate on error strategy used in this task group is @@ -107,20 +111,19 @@ public void testTerminateOnInProgressTaskCompletion() { .withTerminateOnErrorStrategy(TaskGroupTerminateOnErrorStrategy.TERMINATE_ON_IN_PROGRESS_TASKS_COMPLETION); IPancake rootPancake = pancakeFtg.invokeAsync(context).map(indexable -> { IPancake pancake = (IPancake) indexable; - System.out.println("map.onNext: " + pancake.name()); + LOGGER.log(LogLevel.VERBOSE, () -> "map.onNext: " + pancake.name()); seen.add(pancake.name()); return pancake; - }) - .onErrorResume(throwable -> { - System.out.println("map.onErrorResumeNext: " + throwable); - exceptions.add(throwable); - return Mono.empty(); - }).blockLast(); + }).onErrorResume(throwable -> { + LOGGER.log(LogLevel.VERBOSE, () -> "map.onErrorResumeNext: ", throwable); + exceptions.add(throwable); + return Mono.empty(); + }).blockLast(); expectedToSee.removeAll(seen); Assertions.assertTrue(expectedToSee.isEmpty()); Assertions.assertEquals(exceptions.size(), 1); - Assertions.assertTrue(exceptions.get(0) instanceof RuntimeException); + Assertions.assertInstanceOf(RuntimeException.class, exceptions.get(0)); RuntimeException runtimeException = (RuntimeException) exceptions.get(0); Assertions.assertTrue(runtimeException.getMessage().equalsIgnoreCase("B")); } @@ -227,20 +230,19 @@ public void testTerminateOnHittingLcaTask() { IPasta rootPasta = pastaFtg.invokeAsync(context).map(indexable -> { IPasta pasta = (IPasta) indexable; - System.out.println("map.onNext: " + pasta.name()); + LOGGER.log(LogLevel.VERBOSE, () -> "map.onNext: " + pasta.name()); seen.add(pasta.name()); return pasta; - }) - .onErrorResume(throwable -> { - System.out.println("map.onErrorResumeNext: " + throwable); - exceptions.add(throwable); - return Mono.empty(); - }).blockLast(); + }).onErrorResume(throwable -> { + LOGGER.log(LogLevel.VERBOSE, () -> "map.onErrorResumeNext: ", throwable); + exceptions.add(throwable); + return Mono.empty(); + }).blockLast(); expectedToSee.removeAll(seen); Assertions.assertTrue(expectedToSee.isEmpty()); Assertions.assertEquals(exceptions.size(), 1); - Assertions.assertTrue(exceptions.get(0) instanceof RuntimeException); + Assertions.assertInstanceOf(RuntimeException.class, exceptions.get(0)); RuntimeException runtimeException = (RuntimeException) exceptions.get(0); Assertions.assertTrue(runtimeException.getMessage().equalsIgnoreCase("B")); } @@ -344,11 +346,11 @@ public void testCompositeError() { IPancake rootPancake = pancakeFtg.invokeAsync(context).map(indexable -> { IPancake pancake = (IPancake) indexable; String name = pancake.name(); - System.out.println("map.onNext:" + name); + LOGGER.log(LogLevel.VERBOSE, () -> "map.onNext:" + name); seen.add(name); return pancake; }).onErrorResume(throwable -> { - System.out.println("map.onErrorResumeNext:" + throwable); + LOGGER.log(LogLevel.VERBOSE, () -> "map.onErrorResumeNext:", throwable); exceptions.add(throwable); return Mono.empty(); }).blockLast(); @@ -356,7 +358,7 @@ public void testCompositeError() { expectedToSee.removeAll(seen); Assertions.assertTrue(expectedToSee.isEmpty()); Assertions.assertEquals(exceptions.size(), 1); - Assertions.assertTrue(exceptions.get(0) instanceof RuntimeException); + Assertions.assertInstanceOf(RuntimeException.class, exceptions.get(0)); RuntimeException compositeException = (RuntimeException) exceptions.get(0); Assertions.assertEquals(compositeException.getSuppressed().length, 2); for (Throwable throwable : compositeException.getSuppressed()) { @@ -462,10 +464,10 @@ public void testErrorOnRoot() { IPancake rootPancake = pancakeFtg.invokeAsync(context).map(indexable -> { IPancake pancake = (IPancake) indexable; seen.add(pancake.name()); - System.out.println("map.onNext:" + pancake.name()); + LOGGER.log(LogLevel.VERBOSE, () -> "map.onNext:" + pancake.name()); return pancake; }).onErrorResume(throwable -> { - System.out.println("map.onErrorResumeNext:" + throwable); + LOGGER.log(LogLevel.VERBOSE, () -> "map.onErrorResumeNext:", throwable); exceptions.add(throwable); return Mono.empty(); }).blockLast(); @@ -473,7 +475,7 @@ public void testErrorOnRoot() { expectedToSee.removeAll(seen); Assertions.assertTrue(expectedToSee.isEmpty()); Assertions.assertEquals(exceptions.size(), 1); - Assertions.assertTrue(exceptions.get(0) instanceof RuntimeException); + Assertions.assertInstanceOf(RuntimeException.class, exceptions.get(0)); RuntimeException runtimeException = (RuntimeException) exceptions.get(0); Assertions.assertTrue(runtimeException.getMessage().equalsIgnoreCase("F")); } diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/fluentcore/dag/DAGraphTests.java b/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/fluentcore/dag/DAGraphTests.java index f2a9814a8c92..ba6710befa36 100644 --- a/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/fluentcore/dag/DAGraphTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/fluentcore/dag/DAGraphTests.java @@ -15,7 +15,7 @@ public class DAGraphTests { @Test public void testDAGraphGetNext() { - /** + /* * |-------->[D]------>[B]-----------[A] * | ^ ^ * | | | @@ -85,7 +85,7 @@ public void testDAGraphGetNext() { @Test public void testGraphDependency() { - /** + /* * |-------->[D]------>[B]---------->[A] * | ^ ^ * | | | @@ -148,7 +148,7 @@ public void testGraphDeadLockDetection() { boolean dlDetected; // ---------------------------------------------------- - /** + /* * [A] <-----------> [A] */ dlDetected = false; @@ -161,7 +161,7 @@ public void testGraphDeadLockDetection() { Assertions.assertTrue(dlDetected, "Expected exception is not thrown"); // ---------------------------------------------------- - /** + /* * [A] -----------> [B] * ^ ^ * | | @@ -184,7 +184,7 @@ public void testGraphDeadLockDetection() { Assertions.assertTrue(dlDetected, "Expected exception is not thrown"); // ---------------------------------------------------- - /** + /* * [2] ------------> [1] * ^ | * ----------------| | @@ -211,7 +211,7 @@ public void testGraphNodeTableBubblingUp() { // ---------------------------------------------------- // Graph-1 - /** + /* * [B] -----------> [A] * ^ ^ * | | @@ -232,7 +232,7 @@ public void testGraphNodeTableBubblingUp() { // ---------------------------------------------------- // Graph-2 - /** + /* * [E] ---> [D] ---> G * ^ * | @@ -252,7 +252,7 @@ public void testGraphNodeTableBubblingUp() { // ---------------------------------------------------- // Graph-3 - /** + /* * [J] ---> [H] ---> I */ @@ -276,7 +276,7 @@ public void testGraphNodeTableBubblingUp() { DAGraph graph4Root1 = graph2Root; // graphF DAGraph graph4Root2 = graph3Root; // graphJ - /** + /* * [B] -----------> [A] * ^ ^ * | | @@ -373,7 +373,7 @@ public void testGraphNodeTableBubblingUp() { // ---------------------------------------------------- // Graph-1 - /** + /* * [L] -----------> [K] * ^ ^ * | | @@ -395,7 +395,7 @@ public void testGraphNodeTableBubblingUp() { // graphA.addDependencyGraph(graphL); - /** + /* * |---------> [L] -----------> [K] * | ^ ^ * | | | @@ -462,17 +462,15 @@ public void testGraphNodeTableBubblingUp() { private DAGraph createGraph(String resourceName) { ItemHolder node = new ItemHolder(resourceName, "data" + resourceName); - DAGraph graph = new DAGraph<>(node); - return graph; + return new DAGraph<>(node); } private void assertExactMatch(Set set, String[] values) { - HashSet s = new HashSet<>(); - s.addAll(set); + HashSet s = new HashSet<>(set); - s.removeAll(Arrays.asList(values)); - if (s.size() != 0) { - Assertions.assertTrue(false, "Content of set " + set + " does not match with provided array " + Arrays.asList(values)); + Arrays.asList(values).forEach(s::remove); + if (!s.isEmpty()) { + Assertions.fail("Content of set " + set + " does not match with provided array " + Arrays.asList(values)); } } } diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/fluentcore/dag/OrderImpl.java b/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/fluentcore/dag/OrderImpl.java index 81f498b22ec2..d4ac227fff7c 100644 --- a/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/fluentcore/dag/OrderImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/fluentcore/dag/OrderImpl.java @@ -3,6 +3,8 @@ package com.azure.resourcemanager.resources.fluentcore.dag; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.resourcemanager.resources.fluentcore.model.implementation.CreatableUpdatableImpl; import reactor.core.publisher.Mono; @@ -14,6 +16,8 @@ public class OrderImpl extends CreatableUpdatableImpl implements IOrder { + private static final ClientLogger LOGGER = new ClientLogger(OrderImpl.class); + /** * Creates SandwichImpl. * @@ -26,7 +30,7 @@ protected OrderImpl(String name, OrderInner innerObject) { @Override public Mono createResourceAsync() { - System.out.println("Order(" + this.name() + ")::createResourceAsync() [Creating order]"); + LOGGER.log(LogLevel.VERBOSE, () -> "Order(" + this.name() + ")::createResourceAsync() [Creating order]"); return Mono.just(this) .delayElement(Duration.ofMillis(250)) .map(sandwich -> sandwich); diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/fluentcore/dag/PanCakeImpl.java b/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/fluentcore/dag/PanCakeImpl.java index c1c13ddb0f92..743ff9dac62b 100644 --- a/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/fluentcore/dag/PanCakeImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/fluentcore/dag/PanCakeImpl.java @@ -3,6 +3,8 @@ package com.azure.resourcemanager.resources.fluentcore.dag; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.resourcemanager.resources.fluentcore.model.Creatable; import com.azure.resourcemanager.resources.fluentcore.model.implementation.CreatableUpdatableImpl; import com.azure.resourcemanager.resources.fluentcore.model.implementation.CreateUpdateTask; @@ -19,6 +21,8 @@ class PancakeImpl extends CreatableUpdatableImpl implements IPancake { + private static final ClientLogger LOGGER = new ClientLogger(PancakeImpl.class); + final List> delayedPancakes; final long eventDelayInMilliseconds; final Throwable errorToThrow; @@ -73,19 +77,19 @@ public void beforeGroupCreateOrUpdate() { this.addDependency(pancake); } int newCount = this.taskGroup().getNode(this.key()).dependencyKeys().size(); - System.out.println("Pancake(" + this.name() + ")::beforeGroupCreateOrUpdate() 'delayedSize':" + this.delayedPancakes.size() - + " 'dependency count [old, new]': [" + oldCount + "," + newCount + "]"); + LOGGER.log(LogLevel.VERBOSE, () -> "Pancake(" + this.name() + ")::beforeGroupCreateOrUpdate() 'delayedSize':" + + this.delayedPancakes.size() + " 'dependency count [old, new]': [" + oldCount + "," + newCount + "]"); } @Override public Mono createResourceAsync() { if (this.errorToThrow == null) { - System.out.println("Pancake(" + this.name() + ")::createResourceAsync() 'onNext()'"); + LOGGER.log(LogLevel.VERBOSE, () -> "Pancake(" + this.name() + ")::createResourceAsync() 'onNext()'"); return Mono.just(this) .delayElement(Duration.ofMillis(this.eventDelayInMilliseconds)) .map(pancake -> pancake); } else { - System.out.println("Pancake(" + this.name() + ")::createResourceAsync() 'onError()'"); + LOGGER.log(LogLevel.VERBOSE, () -> "Pancake(" + this.name() + ")::createResourceAsync() 'onError()'"); return Mono.just(this) .delayElement(Duration.ofMillis(this.eventDelayInMilliseconds)) .flatMap(pancake -> toErrorMono(errorToThrow)); diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/fluentcore/dag/PastaImpl.java b/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/fluentcore/dag/PastaImpl.java index 92c73ad79bd6..f38f7f9ebd70 100644 --- a/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/fluentcore/dag/PastaImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/fluentcore/dag/PastaImpl.java @@ -3,6 +3,8 @@ package com.azure.resourcemanager.resources.fluentcore.dag; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.resourcemanager.resources.fluentcore.model.Creatable; import com.azure.resourcemanager.resources.fluentcore.model.implementation.CreatableUpdatableImpl; import com.azure.resourcemanager.resources.fluentcore.model.implementation.CreateUpdateTask; @@ -19,6 +21,8 @@ class PastaImpl extends CreatableUpdatableImpl implements IPasta { + private static final ClientLogger LOGGER = new ClientLogger(PastaImpl.class); + final List> delayedPastas; final long eventDelayInMilliseconds; final Throwable errorToThrow; @@ -74,19 +78,19 @@ public void beforeGroupCreateOrUpdate() { this.addDependency(pancake); } int newCount = this.taskGroup().getNode(this.key()).dependencyKeys().size(); - System.out.println("Pasta(" + this.name() + ")::beforeGroupCreateOrUpdate() 'delayedSize':" + this.delayedPastas.size() - + " 'dependency count [old, new]': [" + oldCount + "," + newCount + "]"); + LOGGER.log(LogLevel.VERBOSE, () -> "Pasta(" + this.name() + ")::beforeGroupCreateOrUpdate() 'delayedSize':" + + this.delayedPastas.size() + " 'dependency count [old, new]': [" + oldCount + "," + newCount + "]"); } @Override public Mono createResourceAsync() { if (this.errorToThrow == null) { - System.out.println("Pasta(" + this.name() + ")::createResourceAsync() 'onNext()'"); + LOGGER.log(LogLevel.VERBOSE, () -> "Pasta(" + this.name() + ")::createResourceAsync() 'onNext()'"); return Mono.just(this) .delayElement(Duration.ofMillis(this.eventDelayInMilliseconds)) .map(pasta -> pasta); } else { - System.out.println("Pasta(" + this.name() + ")::createResourceAsync() 'onError()'"); + LOGGER.log(LogLevel.VERBOSE, () -> "Pasta(" + this.name() + ")::createResourceAsync() 'onError()'"); return Mono.just(this) .delayElement(Duration.ofMillis(this.eventDelayInMilliseconds)) .flatMap(pasta -> toErrorObservable(errorToThrow)); diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/fluentcore/dag/PizzaImpl.java b/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/fluentcore/dag/PizzaImpl.java index 761d0b600040..dc72b43c093f 100644 --- a/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/fluentcore/dag/PizzaImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/fluentcore/dag/PizzaImpl.java @@ -3,6 +3,8 @@ package com.azure.resourcemanager.resources.fluentcore.dag; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.resourcemanager.resources.fluentcore.model.Creatable; import com.azure.resourcemanager.resources.fluentcore.model.implementation.CreatableUpdatableImpl; import com.azure.resourcemanager.resources.fluentcore.model.implementation.CreateUpdateTask; @@ -19,6 +21,8 @@ class PizzaImpl extends CreatableUpdatableImpl implements IPizza { + private static final ClientLogger LOGGER = new ClientLogger(PizzaImpl.class); + final List> delayedPizzas; boolean prepareCalled = false; @@ -61,13 +65,13 @@ public void beforeGroupCreateOrUpdate() { this.addDependency(pizza); } int newCount = this.taskGroup().getNode(this.key()).dependencyKeys().size(); - System.out.println("Pizza(" + this.name() + ")::beforeGroupCreateOrUpdate() 'delayedSize':" + this.delayedPizzas.size() - + " 'dependency count [old, new]': [" + oldCount + "," + newCount + "]"); + LOGGER.log(LogLevel.VERBOSE, () -> "Pizza(" + this.name() + ")::beforeGroupCreateOrUpdate() 'delayedSize':" + + this.delayedPizzas.size() + " 'dependency count [old, new]': [" + oldCount + "," + newCount + "]"); } @Override public Mono createResourceAsync() { - System.out.println("Pizza(" + this.name() + ")::createResourceAsync()"); + LOGGER.log(LogLevel.VERBOSE, () -> "Pizza(" + this.name() + ")::createResourceAsync()"); return Mono.just(this) .delayElement(Duration.ofMillis(250)) .map(pizza -> pizza); diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/fluentcore/dag/ProxyTaskGroupTests.java b/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/fluentcore/dag/ProxyTaskGroupTests.java index c55b04569380..58fd15b5786e 100644 --- a/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/fluentcore/dag/ProxyTaskGroupTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/fluentcore/dag/ProxyTaskGroupTests.java @@ -3,6 +3,8 @@ package com.azure.resourcemanager.resources.fluentcore.dag; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.resourcemanager.resources.fluentcore.model.Indexable; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -19,6 +21,7 @@ import java.util.concurrent.CountDownLatch; public class ProxyTaskGroupTests { + private static final ClientLogger LOGGER = new ClientLogger(ProxyTaskGroupTests.class); @Test public void testSampleTaskGroupSanity() { @@ -539,7 +542,7 @@ public void testTaskGroupInvocationShouldInvokePostRunDependentTaskGroup() { group1.invokeAsync(group1.newInvocationContext()) - .subscribe(indexable -> System.out.println(indexable.key())); + .subscribe(indexable -> LOGGER.log(LogLevel.VERBOSE, indexable::key)); } @Test diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/fluentcore/dag/SandwichImpl.java b/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/fluentcore/dag/SandwichImpl.java index 3b6a26bf6a3a..419086bfe47c 100644 --- a/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/fluentcore/dag/SandwichImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/fluentcore/dag/SandwichImpl.java @@ -3,6 +3,8 @@ package com.azure.resourcemanager.resources.fluentcore.dag; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.resourcemanager.resources.fluentcore.model.Executable; import com.azure.resourcemanager.resources.fluentcore.model.implementation.CreatableUpdatableImpl; import reactor.core.publisher.Mono; @@ -15,6 +17,8 @@ public class SandwichImpl extends CreatableUpdatableImpl implements ISandwich { + private static final ClientLogger LOGGER = new ClientLogger(SandwichImpl.class); + /** * Creates SandwichImpl. * @@ -34,7 +38,7 @@ public ISandwich withBreadSliceFromStore(Executable breadFetcher) { @Override public Mono createResourceAsync() { - System.out.println("Sandwich(" + this.name() + ")::createResourceAsync() [Creating sandwich]"); + LOGGER.log(LogLevel.VERBOSE, () -> "Sandwich(" + this.name() + ")::createResourceAsync() [Creating sandwich]"); return Mono.just(this) .delayElement(Duration.ofMillis(250)) .map(sandwich -> sandwich); diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/ApplicationGatewayTests.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/ApplicationGatewayTests.java index f47cf9a846e4..b481cdee7727 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/ApplicationGatewayTests.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/ApplicationGatewayTests.java @@ -9,6 +9,8 @@ import com.azure.core.http.policy.HttpPipelinePolicy; import com.azure.core.http.policy.RetryPolicy; import com.azure.core.management.exception.ManagementException; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.resourcemanager.compute.models.KnownLinuxVirtualMachineImage; import com.azure.resourcemanager.compute.models.VirtualMachine; import com.azure.resourcemanager.network.models.ApplicationGateway; @@ -46,6 +48,8 @@ import org.junit.jupiter.api.Test; public class ApplicationGatewayTests extends ResourceManagerTestProxyTestBase { + private static final ClientLogger LOGGER = new ClientLogger(ApplicationGatewayTests.class); + private AzureResourceManager azureResourceManager; @Override @@ -228,7 +232,7 @@ public void testAppGatewayBackendHealthCheck() throws Exception { } } } - System.out.println(info.toString()); + LOGGER.log(LogLevel.VERBOSE, () -> info.toString()); // Verify app gateway Assertions.assertEquals(2, appGateway.backends().size()); @@ -247,8 +251,8 @@ public void testAppGatewayBackendHealthCheck() throws Exception { ApplicationGatewayBackendHealth backendHealth1 = backendHealths.get(backend1.name()); Assertions.assertNotNull(backendHealth1); Assertions.assertNotNull(backendHealth1.backend()); - for (int i = 0; i < ipAddresses.length; i++) { - Assertions.assertTrue(backend1.containsIPAddress(ipAddresses[i])); + for (String ipAddress : ipAddresses) { + Assertions.assertTrue(backend1.containsIPAddress(ipAddress)); } // Verify second backend (NIC based) diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/AzureResourceManagerTests.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/AzureResourceManagerTests.java index 6f128a12344d..dcab933c7130 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/AzureResourceManagerTests.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/AzureResourceManagerTests.java @@ -9,10 +9,14 @@ import com.azure.core.http.policy.HttpPipelinePolicy; import com.azure.core.http.policy.RetryPolicy; import com.azure.core.http.rest.PagedIterable; +import com.azure.core.management.Region; import com.azure.core.management.exception.ManagementException; +import com.azure.core.management.profile.AzureProfile; import com.azure.core.test.annotation.DoNotRecord; import com.azure.core.test.models.TestProxySanitizer; import com.azure.core.test.models.TestProxySanitizerType; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.resourcemanager.authorization.models.BuiltInRole; import com.azure.resourcemanager.compute.models.CachingTypes; import com.azure.resourcemanager.compute.models.Disk; @@ -49,27 +53,33 @@ import com.azure.resourcemanager.network.models.Subnet; import com.azure.resourcemanager.network.models.Topology; import com.azure.resourcemanager.network.models.VerificationIPFlow; -import com.azure.resourcemanager.resources.fluentcore.model.CreatedResources; -import com.azure.resourcemanager.resources.models.LockLevel; -import com.azure.resourcemanager.resources.models.ManagementLock; -import com.azure.resourcemanager.resources.models.ResourceGroup; -import com.azure.resourcemanager.storage.models.StorageAccountSkuType; -import com.azure.resourcemanager.test.utils.TestUtilities; import com.azure.resourcemanager.resources.fluentcore.arm.CountryIsoCode; -import com.azure.core.management.Region; import com.azure.resourcemanager.resources.fluentcore.model.Creatable; -import com.azure.core.management.profile.AzureProfile; +import com.azure.resourcemanager.resources.fluentcore.model.CreatedResources; import com.azure.resourcemanager.resources.fluentcore.utils.HttpPipelineProvider; import com.azure.resourcemanager.resources.fluentcore.utils.ResourceManagerUtils; import com.azure.resourcemanager.resources.models.Deployment; import com.azure.resourcemanager.resources.models.DeploymentMode; import com.azure.resourcemanager.resources.models.GenericResource; import com.azure.resourcemanager.resources.models.Location; +import com.azure.resourcemanager.resources.models.LockLevel; +import com.azure.resourcemanager.resources.models.ManagementLock; import com.azure.resourcemanager.resources.models.RegionCategory; import com.azure.resourcemanager.resources.models.RegionType; +import com.azure.resourcemanager.resources.models.ResourceGroup; import com.azure.resourcemanager.resources.models.Subscription; import com.azure.resourcemanager.storage.models.StorageAccount; -import java.io.IOException; +import com.azure.resourcemanager.storage.models.StorageAccountSkuType; +import com.azure.resourcemanager.test.ResourceManagerTestProxyTestBase; +import com.azure.resourcemanager.test.utils.TestDelayProvider; +import com.azure.resourcemanager.test.utils.TestIdentifierProvider; +import com.azure.resourcemanager.test.utils.TestUtilities; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import reactor.core.publisher.Flux; +import reactor.core.scheduler.Schedulers; + import java.text.MessageFormat; import java.time.Duration; import java.time.temporal.ChronoUnit; @@ -84,16 +94,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import com.azure.resourcemanager.test.ResourceManagerTestProxyTestBase; -import com.azure.resourcemanager.test.utils.TestDelayProvider; -import com.azure.resourcemanager.test.utils.TestIdentifierProvider; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; -import reactor.core.publisher.Flux; -import reactor.core.scheduler.Schedulers; - public class AzureResourceManagerTests extends ResourceManagerTestProxyTestBase { + private static final ClientLogger LOGGER = new ClientLogger(AzureResourceManagerTests.class); + private AzureResourceManager azureResourceManager; public AzureResourceManagerTests() { @@ -138,7 +141,6 @@ protected void cleanUpResources() { /** * Stress-tests the resilience of ExpandableEnum to multi-threaded access * - * @throws Exception */ @Test public void testExpandableEnum() throws Exception { @@ -223,17 +225,17 @@ public void run() { // Verify country ISO codes Collection countryIsoCodes = CountryIsoCode.values(); - System.out.println("\n## Country ISO codes: " + countryIsoCodes.size()); + LOGGER.log(LogLevel.VERBOSE, () -> "\n## Country ISO codes: " + countryIsoCodes.size()); for (CountryIsoCode value : countryIsoCodes) { - System.out.println(value.toString()); + LOGGER.log(LogLevel.VERBOSE, value::toString); } Assertions.assertEquals(257, countryIsoCodes.size()); // Verify power states Collection powerStates = PowerState.values(); - System.out.println("\n## Power states: " + powerStates.size()); + LOGGER.log(LogLevel.VERBOSE, () -> "\n## Power states: " + powerStates.size()); for (PowerState value : powerStates) { - System.out.println(value.toString()); + LOGGER.log(LogLevel.VERBOSE, value::toString); } Assertions.assertEquals(27, powerStates.size()); } @@ -245,15 +247,13 @@ public void run() { /** * Tests ARM template deployments. * - * @throws IOException - * @throws ManagementException */ @DoNotRecord(skipInPlayback = true) // response contains token in hostpoolToken @Test - public void testDeployments() throws Exception { + public void testDeployments() { String testId = azureResourceManager.deployments().manager().resourceManager().internalContext().randomResourceName("", 8); PagedIterable deployments = azureResourceManager.deployments().list(); - System.out.println("Deployments: " + TestUtilities.getSize(deployments)); + LOGGER.log(LogLevel.VERBOSE, () -> "Deployments: " + TestUtilities.getSize(deployments)); Deployment deployment = azureResourceManager .deployments() @@ -263,7 +263,7 @@ public void testDeployments() throws Exception { .withParametersLink(PARAMETERS_URI, CONTENT_VERSION) .withMode(DeploymentMode.COMPLETE) .create(); - System.out.println("Created deployment: " + deployment.correlationId()); + LOGGER.log(LogLevel.VERBOSE, () -> "Created deployment: " + deployment.correlationId()); azureResourceManager.resourceGroups().beginDeleteByName("rg" + testId); } @@ -271,10 +271,9 @@ public void testDeployments() throws Exception { /** * Tests basic generic resources retrieval. * - * @throws Exception */ @Test - public void testGenericResources() throws Exception { + public void testGenericResources() { // Create some resources NetworkSecurityGroup nsg = azureResourceManager @@ -312,10 +311,9 @@ public void testGenericResources() throws Exception { * Tests management locks. * NOTE: This requires the service principal to have an Owner role on the subscription * - * @throws Exception */ @Test - public void testManagementLocks() throws Exception { + public void testManagementLocks() { // Prepare a VM final String password = ResourceManagerTestProxyTestBase.password(); final String rgName = generateRandomResourceName("rg", 15); @@ -487,14 +485,14 @@ public void testManagementLocks() throws Exception { Assertions.assertNotNull(locksGroup); int locksAllCount = TestUtilities.getSize(locksSubscription); - System.out.println("All locks: " + locksAllCount); + LOGGER.log(LogLevel.VERBOSE, () -> "All locks: " + locksAllCount); Assertions.assertTrue(6 <= locksAllCount); int locksGroupCount = TestUtilities.getSize(locksGroup); - System.out.println("Group locks: " + locksGroupCount); + LOGGER.log(LogLevel.VERBOSE, () -> "Group locks: " + locksGroupCount); Assertions.assertEquals(6, locksGroupCount); } catch (Exception ex) { - ex.printStackTrace(System.out); + LOGGER.log(LogLevel.VERBOSE, () -> "Error occurred", ex); } finally { if (resourceGroup != null) { if (lockGroup != null) { @@ -524,21 +522,19 @@ public void testManagementLocks() throws Exception { /** * Tests VM images. * - * @throws IOException - * @throws ManagementException */ @DoNotRecord(skipInPlayback = true) @Test - public void testVMImages() throws ManagementException, IOException { + public void testVMImages() throws ManagementException { PagedIterable publishers = azureResourceManager.virtualMachineImages().publishers().listByRegion(Region.US_WEST); Assertions.assertTrue(TestUtilities.getSize(publishers) > 0); for (VirtualMachinePublisher p : publishers.stream().limit(5).toArray(VirtualMachinePublisher[]::new)) { - System.out.println(String.format("Publisher name: %s, region: %s", p.name(), p.region())); + LOGGER.log(LogLevel.VERBOSE, () -> "Publisher name: " + p.name() + ", region: " + p.region()); for (VirtualMachineOffer o : p.offers().list().stream().limit(5).toArray(VirtualMachineOffer[]::new)) { - System.out.println(String.format("\tOffer name: %s", o.name())); + LOGGER.log(LogLevel.VERBOSE, () -> "\tOffer name: " + o.name()); for (VirtualMachineSku s : o.skus().list().stream().limit(5).toArray(VirtualMachineSku[]::new)) { - System.out.println(String.format("\t\tSku name: %s", s.name())); + LOGGER.log(LogLevel.VERBOSE, () -> "\t\tSku name: " + s.name()); } } } @@ -552,7 +548,6 @@ public void testVMImages() throws ManagementException, IOException { /** * Tests the network security group implementation. * - * @throws Exception */ @Test public void testNetworkSecurityGroups() throws Exception { @@ -562,7 +557,6 @@ public void testNetworkSecurityGroups() throws Exception { /** * Tests the inbound NAT rule support in load balancers. * - * @throws Exception */ @DoNotRecord(skipInPlayback = true) // TODO(weidxu) @Test @@ -574,7 +568,6 @@ public void testLoadBalancersNatRules() throws Exception { /** * Tests the inbound NAT pool support in load balancers. * - * @throws Exception */ @DoNotRecord(skipInPlayback = true) // TODO(weidxu) @Test @@ -586,7 +579,6 @@ public void testLoadBalancersNatPools() throws Exception { /** * Tests the minimum Internet-facing load balancer with a load balancing rule only * - * @throws Exception */ @Test public void testLoadBalancersInternetMinimum() throws Exception { @@ -597,7 +589,6 @@ public void testLoadBalancersInternetMinimum() throws Exception { /** * Tests the minimum Internet-facing load balancer with a NAT rule only * - * @throws Exception */ @Test public void testLoadBalancersNatOnly() throws Exception { @@ -608,7 +599,6 @@ public void testLoadBalancersNatOnly() throws Exception { /** * Tests the minimum internal load balancer. * - * @throws Exception */ @Test public void testLoadBalancersInternalMinimum() throws Exception { @@ -619,7 +609,6 @@ public void testLoadBalancersInternalMinimum() throws Exception { /** * Tests the internal load balancer with availability zone. * - * @throws Exception */ @Test @Disabled("Though valid scenario, NRP is failing") @@ -629,7 +618,7 @@ public void testLoadBalancersInternalWithAvailabilityZone() throws Exception { } @Test - public void testManagedDiskVMUpdate() throws Exception { + public void testManagedDiskVMUpdate() { ResourceManagerUtils.InternalRuntimeContext context = azureResourceManager.disks().manager().resourceManager().internalContext(); final String rgName = context.randomResourceName("rg", 13); final String linuxVM2Name = context.randomResourceName("vm" + "-", 10); @@ -661,7 +650,6 @@ public void testManagedDiskVMUpdate() throws Exception { /** * Tests the public IP address implementation. * - * @throws Exception */ @Test public void testPublicIPAddresses() throws Exception { @@ -671,7 +659,6 @@ public void testPublicIPAddresses() throws Exception { /** * Tests the public IP address implementation. * - * @throws Exception */ @Test public void testPublicIPPrefixes() throws Exception { @@ -681,7 +668,6 @@ public void testPublicIPPrefixes() throws Exception { /** * Tests the availability set implementation. * - * @throws Exception */ @Test public void testAvailabilitySets() throws Exception { @@ -691,7 +677,6 @@ public void testAvailabilitySets() throws Exception { /** * Tests the virtual network implementation. * - * @throws Exception */ @Test public void testNetworks() throws Exception { @@ -701,7 +686,6 @@ public void testNetworks() throws Exception { /** * Tests virtual network peering * - * @throws Exception */ @Test public void testNetworkWithAccessFromServiceToSubnet() throws Exception { @@ -711,7 +695,6 @@ public void testNetworkWithAccessFromServiceToSubnet() throws Exception { /** * Tests virtual network peering * - * @throws Exception */ @Test public void testNetworkPeerings() throws Exception { @@ -721,7 +704,6 @@ public void testNetworkPeerings() throws Exception { /** * Tests virtual network with DDoS protection plan * - * @throws Exception */ @Test public void testDdosAndVmProtection() throws Exception { @@ -731,7 +713,6 @@ public void testDdosAndVmProtection() throws Exception { /** * Tests updateTags for virtual network. * - * @throws Exception */ @Test public void testNetworkUpdateTags() throws Exception { @@ -741,7 +722,6 @@ public void testNetworkUpdateTags() throws Exception { /** * Tests route tables. * - * @throws Exception */ @Test public void testRouteTables() throws Exception { @@ -752,16 +732,16 @@ public void testRouteTables() throws Exception { @Test public void testRegions() { // Show built-in regions - System.out.println("Built-in regions list:"); + LOGGER.log(LogLevel.VERBOSE, () -> "Built-in regions list:"); int regionsCount = Region.values().size(); for (Region region : Region.values()) { - System.out.println("Name: " + region.name() + ", Label: " + region.label()); + LOGGER.log(LogLevel.VERBOSE, () -> "Name: " + region.name() + ", Label: " + region.label()); } // Look up built-in region Region region = Region.fromName("westus"); - Assertions.assertTrue(region == Region.US_WEST); + Assertions.assertSame(region, Region.US_WEST); // Add a region Region region2 = Region.fromName("madeUpRegion"); @@ -775,7 +755,6 @@ public void testRegions() { /** * Tests the network interface implementation. * - * @throws Exception */ @Test public void testNetworkInterfaces() throws Exception { @@ -785,7 +764,6 @@ public void testNetworkInterfaces() throws Exception { /** * Tests the network watcher implementation. * - * @throws Exception */ @Test public void testNetworkWatchers() throws Exception { @@ -859,7 +837,7 @@ public void testNetworkWatcherFunctions() throws Exception { .withRetentionPolicyDays(5) .withRetentionPolicyEnabled() .apply(); - Assertions.assertEquals(true, flowLogSettings.enabled()); + Assertions.assertTrue(flowLogSettings.enabled()); Assertions.assertEquals(5, flowLogSettings.retentionDays()); Assertions.assertEquals(storageAccount.id(), flowLogSettings.storageId()); @@ -945,7 +923,6 @@ public void testNetworkWatcherFunctions() throws Exception { /** * Tests the local network gateway implementation. * - * @throws Exception */ @DoNotRecord(skipInPlayback = true) // TODO(weidxu) @Test @@ -956,7 +933,6 @@ public void testLocalNetworkGateways() throws Exception { /** * Tests the express route circuit implementation. * - * @throws Exception */ @Test @Disabled("Failed to provision ExpressRoute circuit as the service provider does not have sufficient capacity at this location.") @@ -967,7 +943,6 @@ public void testExpressRouteCircuits() throws Exception { /** * Tests the express route circuit peerings implementation. * - * @throws Exception */ @Test @Disabled("Failed to provision ExpressRoute circuit as the service provider does not have sufficient capacity at this location.") @@ -979,7 +954,6 @@ public void testExpressRouteCircuitPeering() throws Exception { /** * Tests virtual machines. * - * @throws Exception */ @Test @Disabled("osDiskSize is returned as 127 instead of 128 - known service bug") @@ -992,7 +966,6 @@ public void testVirtualMachines() throws Exception { /** * Tests the virtual machine data disk implementation. * - * @throws Exception */ @Test public void testVirtualMachineDataDisk() throws Exception { @@ -1002,7 +975,6 @@ public void testVirtualMachineDataDisk() throws Exception { /** * Tests the virtual machine network interface implementation. * - * @throws Exception */ @Test public void testVirtualMachineNics() throws Exception { @@ -1012,7 +984,6 @@ public void testVirtualMachineNics() throws Exception { /** * Tests virtual machine support for SSH. * - * @throws Exception */ @Test public void testVirtualMachineSSh() throws Exception { @@ -1022,7 +993,6 @@ public void testVirtualMachineSSh() throws Exception { /** * Tests virtual machine sizes. * - * @throws Exception */ @Test public void testVirtualMachineSizes() throws Exception { @@ -1049,10 +1019,9 @@ public void testVirtualMachineSyncPoller() throws Exception { /** * Tests subscription listing. * - * @throws Exception */ @Test - public void listSubscriptions() throws Exception { + public void listSubscriptions() { Assertions.assertTrue(0 < TestUtilities.getSize(azureResourceManager.subscriptions().list())); Subscription subscription = azureResourceManager.getCurrentSubscription(); Assertions.assertNotNull(subscription); @@ -1064,10 +1033,9 @@ public void listSubscriptions() throws Exception { /** * Tests location listing. * - * @throws Exception */ @Test - public void listLocations() throws Exception { + public void listLocations() { Subscription subscription = azureResourceManager.getCurrentSubscription(); Assertions.assertNotNull(subscription); for (Location location : subscription.listLocations()) { @@ -1085,27 +1053,25 @@ public void listLocations() throws Exception { /** * Tests resource group listing. * - * @throws Exception */ @Test - public void listResourceGroups() throws Exception { + public void listResourceGroups() { int groupCount = TestUtilities.getSize(azureResourceManager.resourceGroups().list()); - System.out.println(String.format("Group count: %s", groupCount)); + LOGGER.log(LogLevel.VERBOSE, () -> "Group count: " + groupCount); Assertions.assertTrue(0 < groupCount); } /** * Tests storage account listing. * - * @throws Exception */ @Test - public void listStorageAccounts() throws Exception { + public void listStorageAccounts() { Assertions.assertTrue(0 < TestUtilities.getSize(azureResourceManager.storageAccounts().list())); } @Test - public void createStorageAccount() throws Exception { + public void createStorageAccount() { String storageAccountName = generateRandomResourceName("testsa", 12); StorageAccount storageAccount = azureResourceManager @@ -1175,7 +1141,7 @@ public void testContainerInstanceWithPublicIpAddressWithSystemAssignedMsi() thro } @Test - public void testContainerInstanceWithPublicIpAddressWithUserAssignedMsi() throws Exception { + public void testContainerInstanceWithPublicIpAddressWithUserAssignedMsi() { final String cgName = generateRandomResourceName("aci", 10); final String rgName = generateRandomResourceName("rgaci", 10); String identityName1 = generateRandomResourceName("msi-id", 15); @@ -1198,7 +1164,7 @@ public void testContainerInstanceWithPublicIpAddressWithUserAssignedMsi() throws .withExistingResourceGroup(rgName) .withAccessToCurrentResourceGroup(BuiltInRole.CONTRIBUTOR); - List dnsServers = new ArrayList(); + List dnsServers = new ArrayList<>(); dnsServers.add("dnsServer1"); ContainerGroup containerGroup = azureResourceManager @@ -1283,14 +1249,14 @@ public void testContainerInstanceWithPublicIpAddressWithUserAssignedMsi() throws List containerGroupList = azureResourceManager.containerGroups().listByResourceGroup(rgName).stream().collect(Collectors.toList()); - Assertions.assertTrue(containerGroupList.size() > 0); + Assertions.assertFalse(containerGroupList.isEmpty()); containerGroup.refresh(); Set containerGroupOperations = azureResourceManager.containerGroups().listOperations().stream().collect(Collectors.toSet()); // Number of supported operation can change hence don't assert with a predefined number. - Assertions.assertTrue(containerGroupOperations.size() > 0); + Assertions.assertFalse(containerGroupOperations.isEmpty()); } @Test @@ -1386,7 +1352,7 @@ public void generateMissingRegion() { } } - Assertions.assertTrue(sb.length() == 0, sb.toString()); + Assertions.assertEquals(0, sb.length(), sb.toString()); } private static Region findByLabelOrName(String labelOrName) { diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/PrivateLinkTests.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/PrivateLinkTests.java index 882ce2ab1b5f..a5f66e2472fe 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/PrivateLinkTests.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/PrivateLinkTests.java @@ -12,8 +12,8 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.core.management.Region; import com.azure.core.management.profile.AzureProfile; -import com.azure.core.util.serializer.JacksonAdapter; -import com.azure.core.util.serializer.SerializerEncoding; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.resourcemanager.appservice.models.PricingTier; import com.azure.resourcemanager.appservice.models.RuntimeStack; import com.azure.resourcemanager.appservice.models.WebApp; @@ -50,17 +50,14 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import java.io.File; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; import java.time.Duration; import java.time.temporal.ChronoUnit; import java.util.Collections; -import java.util.HashMap; import java.util.List; import java.util.stream.Collectors; public class PrivateLinkTests extends ResourceManagerTestProxyTestBase { + private static final ClientLogger LOGGER = new ClientLogger(PrivateLinkTests.class); private AzureResourceManager azureResourceManager; private String rgName; @@ -122,7 +119,7 @@ public void testPrivateEndpoint() { // String pecName2 = generateRandomResourceName("pec", 10); String saDomainName = saName + ".blob.core.windows.net"; - System.out.println("storage account domain name: " + saDomainName); + LOGGER.log(LogLevel.VERBOSE, () -> "storage account domain name: " + saDomainName); StorageAccount storageAccount = azureResourceManager.storageAccounts().define(saName) .withRegion(region) @@ -228,7 +225,7 @@ public void testPrivateEndpoint() { Assertions.assertEquals("Approved", privateEndpoint.privateLinkServiceConnections().get(pecName).state().status()); String saPrivateIp = privateEndpoint.customDnsConfigurations().get(0).ipAddresses().get(0); - System.out.println("storage account private ip: " + saPrivateIp); + LOGGER.log(LogLevel.VERBOSE, () -> "storage account private ip: " + saPrivateIp); // verify list List privateEndpoints = azureResourceManager.privateEndpoints().listByResourceGroup(rgName).stream().collect(Collectors.toList()); @@ -248,7 +245,7 @@ public void testPrivateEndpointE2E() { String vmName = generateRandomResourceName("vm", 10); String saDomainName = saName + ".blob.core.windows.net"; - System.out.println("storage account domain name: " + saDomainName); + LOGGER.log(LogLevel.VERBOSE, () -> "storage account domain name: " + saDomainName); StorageAccount storageAccount = azureResourceManager.storageAccounts().define(saName) .withRegion(region) @@ -289,7 +286,7 @@ public void testPrivateEndpointE2E() { Assertions.assertEquals("Approved", privateEndpoint.privateLinkServiceConnections().get(pecName).state().status()); String saPrivateIp = privateEndpoint.customDnsConfigurations().get(0).ipAddresses().get(0); - System.out.println("storage account private ip: " + saPrivateIp); + LOGGER.log(LogLevel.VERBOSE, () -> "storage account private ip: " + saPrivateIp); VirtualMachine virtualMachine = null; if (validateOnVirtualMachine) { @@ -310,7 +307,7 @@ public void testPrivateEndpointE2E() { // verify private endpoint not yet works RunCommandResult commandResult = virtualMachine.runShellScript(Collections.singletonList("nslookup " + saDomainName), null); for (InstanceViewStatus status : commandResult.value()) { - System.out.println(status.message()); + LOGGER.log(LogLevel.VERBOSE, () -> status.message()); } Assertions.assertFalse(commandResult.value().stream().anyMatch(status -> status.message().contains(saPrivateIp))); } @@ -335,7 +332,7 @@ public void testPrivateEndpointE2E() { // verify private endpoint works RunCommandResult commandResult = virtualMachine.runShellScript(Collections.singletonList("nslookup " + saDomainName), null); for (InstanceViewStatus status : commandResult.value()) { - System.out.println(status.message()); + LOGGER.log(LogLevel.VERBOSE, () -> status.message()); } Assertions.assertTrue(commandResult.value().stream().anyMatch(status -> status.message().contains(saPrivateIp))); } @@ -560,11 +557,4 @@ private parseAuthFile(String authFilename) throws Exception { - String content = new String(Files.readAllBytes(new File(authFilename).toPath()), StandardCharsets.UTF_8).trim(); - HashMap auth = new HashMap<>(); - auth = new JacksonAdapter().deserialize(content, auth.getClass(), SerializerEncoding.JSON); - return auth; - } } diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestApplicationGateway.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestApplicationGateway.java index 7bc709c81960..190280a546eb 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestApplicationGateway.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestApplicationGateway.java @@ -2,6 +2,8 @@ // Licensed under the MIT License. package com.azure.resourcemanager; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.resourcemanager.network.models.ApplicationGateway; import com.azure.resourcemanager.network.models.ApplicationGatewayAuthenticationCertificate; import com.azure.resourcemanager.network.models.ApplicationGatewayBackend; @@ -39,6 +41,8 @@ /** Test of application gateway management. */ public class TestApplicationGateway { + private static final ClientLogger LOGGER = new ClientLogger(TestApplicationGateway.class); + String testId = ""; static final Region REGION = Region.US_WEST; String groupName = ""; @@ -381,9 +385,8 @@ public class PrivateComplex extends TestTemplate "Uncaught exception", ex); } }; @@ -519,7 +522,7 @@ public void run() { .withInstanceCount(2) .create(); } catch (IOException e) { - e.printStackTrace(); + LOGGER.log(LogLevel.VERBOSE, () -> "Error creating application gateway", e); } } }); @@ -843,9 +846,8 @@ public class PublicComplex extends TestTemplate "Uncaught exception", ex); } }; @@ -962,7 +964,7 @@ public void run() { .withHttp2() .create(); } catch (IOException e) { - e.printStackTrace(); + LOGGER.log(LogLevel.VERBOSE, () -> "Uncaught exception", e); } } }); @@ -978,7 +980,7 @@ public void run() { ApplicationGateway appGateway = resources.getById(resourceId); Assertions.assertNotNull(appGateway); Assertions.assertTrue(appGateway.isPublic()); - Assertions.assertTrue(!appGateway.isPrivate()); + Assertions.assertFalse(appGateway.isPrivate()); Assertions.assertEquals(ApplicationGatewayTier.STANDARD, appGateway.tier()); Assertions.assertEquals(ApplicationGatewaySkuName.STANDARD_MEDIUM, appGateway.size()); Assertions.assertEquals(2, appGateway.instanceCount()); @@ -997,7 +999,7 @@ public void run() { Assertions.assertEquals(0, appGateway.privateFrontends().size()); ApplicationGatewayFrontend frontend = appGateway.publicFrontends().values().iterator().next(); Assertions.assertTrue(frontend.isPublic()); - Assertions.assertTrue(!frontend.isPrivate()); + Assertions.assertFalse(frontend.isPrivate()); // Verify listeners Assertions.assertEquals(3, appGateway.listeners().size()); @@ -1099,7 +1101,7 @@ public void run() { Assertions.assertEquals(2, appGateway.disabledSslProtocols().size()); Assertions.assertTrue(appGateway.disabledSslProtocols().contains(ApplicationGatewaySslProtocol.TLSV1_0)); Assertions.assertTrue(appGateway.disabledSslProtocols().contains(ApplicationGatewaySslProtocol.TLSV1_1)); - Assertions.assertTrue(!appGateway.disabledSslProtocols().contains(ApplicationGatewaySslProtocol.TLSV1_2)); + Assertions.assertFalse(appGateway.disabledSslProtocols().contains(ApplicationGatewaySslProtocol.TLSV1_2)); return appGateway; } @@ -1148,8 +1150,8 @@ public ApplicationGateway updateResource(final ApplicationGateway resource) thro // Get the resource created so far Assertions.assertTrue(resource.tags().containsKey("tag1")); - Assertions.assertTrue(resource.size().equals(ApplicationGatewaySkuName.STANDARD_SMALL)); - Assertions.assertTrue(resource.instanceCount() == 1); + Assertions.assertEquals(resource.size(), ApplicationGatewaySkuName.STANDARD_SMALL); + Assertions.assertEquals(1, resource.instanceCount()); Assertions.assertFalse(resource.isHttp2Enabled()); // Verify listeners @@ -1157,10 +1159,10 @@ public ApplicationGateway updateResource(final ApplicationGateway resource) thro Assertions.assertTrue("www.contoso.com".equalsIgnoreCase(listener.hostname())); // Verify request routing rules - Assertions.assertTrue(resource.requestRoutingRules().size() == rulesCount - 1); - Assertions.assertTrue(!resource.requestRoutingRules().containsKey("rule9000")); + Assertions.assertEquals(resource.requestRoutingRules().size(), rulesCount - 1); + Assertions.assertFalse(resource.requestRoutingRules().containsKey("rule9000")); ApplicationGatewayRequestRoutingRule rule = resource.requestRoutingRules().get("rule443"); - Assertions.assertTrue(rule != null); + Assertions.assertNotNull(rule); Assertions.assertTrue("listener1".equalsIgnoreCase(rule.listener().name())); // Verify probes @@ -1233,7 +1235,7 @@ public void run() { .attach() .create(); } catch (IOException e) { - e.printStackTrace(); + LOGGER.log(LogLevel.VERBOSE, () -> "Error occurred", e); } } }); @@ -1246,48 +1248,48 @@ public void run() { // Get the resource as created so far String resourceId = createResourceId(resources.manager().subscriptionId()); ApplicationGateway appGateway = resources.manager().applicationGateways().getById(resourceId); - Assertions.assertTrue(appGateway != null); - Assertions.assertTrue(ApplicationGatewayTier.STANDARD.equals(appGateway.tier())); - Assertions.assertTrue(ApplicationGatewaySkuName.STANDARD_SMALL.equals(appGateway.size())); - Assertions.assertTrue(appGateway.instanceCount() == 1); + Assertions.assertNotNull(appGateway); + Assertions.assertEquals(ApplicationGatewayTier.STANDARD, appGateway.tier()); + Assertions.assertEquals(ApplicationGatewaySkuName.STANDARD_SMALL, appGateway.size()); + Assertions.assertEquals(1, appGateway.instanceCount()); // Verify frontend ports - Assertions.assertTrue(appGateway.frontendPorts().size() == 1); - Assertions.assertTrue(appGateway.frontendPortNameFromNumber(443) != null); + Assertions.assertEquals(1, appGateway.frontendPorts().size()); + Assertions.assertNotNull(appGateway.frontendPortNameFromNumber(443)); // Verify frontends - Assertions.assertTrue(!appGateway.isPrivate()); + Assertions.assertFalse(appGateway.isPrivate()); Assertions.assertTrue(appGateway.isPublic()); - Assertions.assertTrue(appGateway.frontends().size() == 1); + Assertions.assertEquals(1, appGateway.frontends().size()); // Verify listeners - Assertions.assertTrue(appGateway.listeners().size() == 1); - Assertions.assertTrue(appGateway.listenerByPortNumber(443) != null); + Assertions.assertEquals(1, appGateway.listeners().size()); + Assertions.assertNotNull(appGateway.listenerByPortNumber(443)); // Verify backends - Assertions.assertTrue(appGateway.backends().size() == 1); + Assertions.assertEquals(1, appGateway.backends().size()); // Verify backend HTTP configs - Assertions.assertTrue(appGateway.backendHttpConfigurations().size() == 1); + Assertions.assertEquals(1, appGateway.backendHttpConfigurations().size()); // Verify rules - Assertions.assertTrue(appGateway.requestRoutingRules().size() == 1); + Assertions.assertEquals(1, appGateway.requestRoutingRules().size()); ApplicationGatewayRequestRoutingRule rule = appGateway.requestRoutingRules().get("rule1"); - Assertions.assertTrue(rule != null); - Assertions.assertTrue(rule.frontendPort() == 443); - Assertions.assertTrue(ApplicationGatewayProtocol.HTTPS.equals(rule.frontendProtocol())); - Assertions.assertTrue(rule.listener() != null); - Assertions.assertTrue(rule.listener().frontend() != null); + Assertions.assertNotNull(rule); + Assertions.assertEquals(443, rule.frontendPort()); + Assertions.assertEquals(ApplicationGatewayProtocol.HTTPS, rule.frontendProtocol()); + Assertions.assertNotNull(rule.listener()); + Assertions.assertNotNull(rule.listener().frontend()); Assertions.assertTrue(rule.listener().frontend().isPublic()); - Assertions.assertTrue(!rule.listener().frontend().isPrivate()); - Assertions.assertTrue(rule.backendPort() == 8080); - Assertions.assertTrue(rule.sslCertificate() != null); - Assertions.assertTrue(rule.backendAddresses().size() == 2); + Assertions.assertFalse(rule.listener().frontend().isPrivate()); + Assertions.assertEquals(8080, rule.backendPort()); + Assertions.assertNotNull(rule.sslCertificate()); + Assertions.assertEquals(2, rule.backendAddresses().size()); Assertions.assertTrue(rule.backend().containsIPAddress("11.1.1.1")); Assertions.assertTrue(rule.backend().containsIPAddress("11.1.1.2")); // Verify certificates - Assertions.assertTrue(appGateway.sslCertificates().size() == 1); + Assertions.assertEquals(1, appGateway.sslCertificates().size()); return appGateway; } @@ -1324,47 +1326,47 @@ public ApplicationGateway updateResource(final ApplicationGateway resource) thro Assertions.assertTrue(resource.tags().containsKey("tag1")); Assertions.assertTrue(resource.tags().containsKey("tag2")); - Assertions.assertTrue(ApplicationGatewaySkuName.STANDARD_MEDIUM.equals(resource.size())); - Assertions.assertTrue(resource.instanceCount() == 2); + Assertions.assertEquals(ApplicationGatewaySkuName.STANDARD_MEDIUM, resource.size()); + Assertions.assertEquals(2, resource.instanceCount()); // Verify frontend ports - Assertions.assertTrue(resource.frontendPorts().size() == 2); - Assertions.assertTrue(resource.frontendPortNameFromNumber(80) != null); + Assertions.assertEquals(2, resource.frontendPorts().size()); + Assertions.assertNotNull(resource.frontendPortNameFromNumber(80)); // Verify listeners - Assertions.assertTrue(resource.listeners().size() == 2); + Assertions.assertEquals(2, resource.listeners().size()); ApplicationGatewayListener listener = resource.listeners().get("listener2"); - Assertions.assertTrue(listener != null); - Assertions.assertTrue(!listener.frontend().isPrivate()); + Assertions.assertNotNull(listener); + Assertions.assertFalse(listener.frontend().isPrivate()); Assertions.assertTrue(listener.frontend().isPublic()); - Assertions.assertTrue(listener.frontendPortNumber() == 80); - Assertions.assertTrue(ApplicationGatewayProtocol.HTTP.equals(listener.protocol())); - Assertions.assertTrue(listener.sslCertificate() == null); + Assertions.assertEquals(80, listener.frontendPortNumber()); + Assertions.assertEquals(ApplicationGatewayProtocol.HTTP, listener.protocol()); + Assertions.assertNull(listener.sslCertificate()); // Verify backends - Assertions.assertTrue(resource.backends().size() == 2); + Assertions.assertEquals(2, resource.backends().size()); ApplicationGatewayBackend backend = resource.backends().get("backend2"); - Assertions.assertTrue(backend != null); - Assertions.assertTrue(backend.addresses().size() == 1); + Assertions.assertNotNull(backend); + Assertions.assertEquals(1, backend.addresses().size()); Assertions.assertTrue(backend.containsIPAddress("11.1.1.3")); // Verify HTTP configs - Assertions.assertTrue(resource.backendHttpConfigurations().size() == 2); + Assertions.assertEquals(2, resource.backendHttpConfigurations().size()); ApplicationGatewayBackendHttpConfiguration config = resource.backendHttpConfigurations().get("config2"); - Assertions.assertTrue(config != null); + Assertions.assertNotNull(config); Assertions.assertTrue(config.cookieBasedAffinity()); - Assertions.assertTrue(config.port() == 8081); - Assertions.assertTrue(config.requestTimeout() == 33); + Assertions.assertEquals(8081, config.port()); + Assertions.assertEquals(33, config.requestTimeout()); // Verify request routing rules - Assertions.assertTrue(resource.requestRoutingRules().size() == 2); + Assertions.assertEquals(2, resource.requestRoutingRules().size()); ApplicationGatewayRequestRoutingRule rule = resource.requestRoutingRules().get("rule2"); - Assertions.assertTrue(rule != null); - Assertions.assertTrue(rule.listener() != null); - Assertions.assertTrue("listener2".equals(rule.listener().name())); - Assertions.assertTrue(rule.backendHttpConfiguration() != null); + Assertions.assertNotNull(rule); + Assertions.assertNotNull(rule.listener()); + Assertions.assertEquals("listener2", rule.listener().name()); + Assertions.assertNotNull(rule.backendHttpConfiguration()); Assertions.assertTrue("config2".equalsIgnoreCase(rule.backendHttpConfiguration().name())); - Assertions.assertTrue(rule.backend() != null); + Assertions.assertNotNull(rule.backend()); Assertions.assertTrue("backend2".equalsIgnoreCase(rule.backend().name())); return resource; @@ -1372,10 +1374,10 @@ public ApplicationGateway updateResource(final ApplicationGateway resource) thro } // Create VNet for the app gateway - private Map ensurePIPs(PublicIpAddresses pips) throws Exception { + private Map ensurePIPs(PublicIpAddresses pips) { List> creatablePips = new ArrayList<>(); - for (int i = 0; i < pipNames.length; i++) { - creatablePips.add(pips.define(pipNames[i]).withRegion(REGION).withNewResourceGroup(groupName)); + for (String pipName : pipNames) { + creatablePips.add(pips.define(pipName).withRegion(REGION).withNewResourceGroup(groupName)); } return pips.create(creatablePips); @@ -1497,7 +1499,7 @@ static void printAppGateway(ApplicationGateway resource) { .append(httpConfig.path()); if (httpConfig.probe() != null) { - info.append("\n\t\t\tProbe: " + httpConfig.probe().name()); + info.append("\n\t\t\tProbe: ").append(httpConfig.probe().name()); } info.append("\n\t\tIs probe enabled? ").append(httpConfig.isProbeEnabled()); } @@ -1653,6 +1655,6 @@ static void printAppGateway(ApplicationGateway resource) { info.append(listener.name()); } } - System.out.println(info.toString()); + LOGGER.log(LogLevel.VERBOSE, () -> info.toString()); } } diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestCdn.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestCdn.java index 79d98ea846f2..e896eea3d65c 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestCdn.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestCdn.java @@ -4,6 +4,8 @@ package com.azure.resourcemanager; import com.azure.core.management.Region; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.resourcemanager.cdn.models.CdnEndpoint; import com.azure.resourcemanager.cdn.models.CdnProfile; import com.azure.resourcemanager.cdn.models.CdnProfiles; @@ -24,6 +26,8 @@ * Test of CDN management. */ public class TestCdn extends TestTemplate { + private static final ClientLogger LOGGER = new ClientLogger(TestCdn.class); + @Override public CdnProfile createResource(CdnProfiles profiles) throws Exception { final Region region = Region.US_EAST; @@ -50,7 +54,7 @@ public CdnProfile createResource(CdnProfiles profiles) throws Exception { .attach() .create(); - Assertions.assertTrue(cdnProfile.sku().name().equals(SkuName.STANDARD_VERIZON)); + Assertions.assertEquals(cdnProfile.sku().name(), SkuName.STANDARD_VERIZON); Assertions.assertNotNull(cdnProfile.endpoints()); Assertions.assertEquals(1, cdnProfile.endpoints().size()); CdnEndpoint endpoint = cdnProfile.endpoints().get(cdnEndpointName); @@ -165,6 +169,6 @@ public void print(CdnProfile profile) { } } } - System.out.println(info.toString()); + LOGGER.log(LogLevel.VERBOSE, info::toString); } } diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestContainerInstanceWithPublicIpAddressWithSystemAssignedMSI.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestContainerInstanceWithPublicIpAddressWithSystemAssignedMSI.java index 435a4212f531..f5349b048003 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestContainerInstanceWithPublicIpAddressWithSystemAssignedMSI.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestContainerInstanceWithPublicIpAddressWithSystemAssignedMSI.java @@ -3,6 +3,8 @@ package com.azure.resourcemanager; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.resourcemanager.authorization.models.BuiltInRole; import com.azure.resourcemanager.containerinstance.models.Container; import com.azure.resourcemanager.containerinstance.models.ContainerGroup; @@ -24,6 +26,8 @@ public class TestContainerInstanceWithPublicIpAddressWithSystemAssignedMSI extends TestTemplate { + private static final ClientLogger LOGGER + = new ClientLogger(TestContainerInstanceWithPublicIpAddressWithSystemAssignedMSI.class); @Override public ContainerGroup createResource(ContainerGroups containerGroups) throws Exception { @@ -104,13 +108,13 @@ public ContainerGroup createResource(ContainerGroups containerGroups) throws Exc List containerGroupList = containerGroups.listByResourceGroup(rgName).stream().collect(Collectors.toList()); - Assertions.assertTrue(containerGroupList.size() > 0); + Assertions.assertFalse(containerGroupList.isEmpty()); containerGroup.refresh(); Set containerGroupOperations = containerGroups.listOperations().stream().collect(Collectors.toSet()); // Number of supported operation can change hence don't assert with a predefined number. - Assertions.assertTrue(containerGroupOperations.size() > 0); + Assertions.assertFalse(containerGroupOperations.isEmpty()); return containerGroup; } @@ -211,6 +215,6 @@ public void print(ContainerGroup resource) { } } - System.out.println(info.toString()); + LOGGER.log(LogLevel.VERBOSE, info::toString); } } diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestDns.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestDns.java index 21b959dda73b..e6ea71a52362 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestDns.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestDns.java @@ -3,6 +3,8 @@ package com.azure.resourcemanager; import com.azure.core.http.rest.PagedIterable; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.resourcemanager.dns.models.ARecordSet; import com.azure.resourcemanager.dns.models.AaaaRecordSet; import com.azure.resourcemanager.dns.models.CnameRecordSet; @@ -34,6 +36,8 @@ import static com.azure.resourcemanager.dns.models.RecordType.TXT; public class TestDns extends TestTemplate { + private static final ClientLogger LOGGER = new ClientLogger(TestDns.class); + @Override public DnsZone createResource(DnsZones dnsZones) throws Exception { final Region region = Region.US_EAST; @@ -92,8 +96,8 @@ public DnsZone createResource(DnsZones dnsZones) throws Exception { // Check Dns zone properties Assertions.assertTrue(dnsZone.name().startsWith(topLevelDomain)); - Assertions.assertTrue(dnsZone.nameServers().size() > 0); // Default '@' name servers - Assertions.assertTrue(dnsZone.tags().size() == 2); + Assertions.assertFalse(dnsZone.nameServers().isEmpty()); // Default '@' name servers + Assertions.assertEquals(2, dnsZone.tags().size()); // Check SOA record - external child resource (created by default) SoaRecordSet soaRecordSet = dnsZone.getSoaRecordSet(); @@ -106,23 +110,23 @@ public DnsZone createResource(DnsZones dnsZones) throws Exception { // Check A records PagedIterable aRecordSets = dnsZone.aRecordSets().list(); - Assertions.assertTrue(aRecordSets.stream().count() == 1); - Assertions.assertTrue(aRecordSets.iterator().next().timeToLive() == 7200); + Assertions.assertEquals(1, aRecordSets.stream().count()); + Assertions.assertEquals(7200, aRecordSets.iterator().next().timeToLive()); // Check AAAA records PagedIterable aaaaRecordSets = dnsZone.aaaaRecordSets().list(); - Assertions.assertTrue(aaaaRecordSets.stream().count() == 1); + Assertions.assertEquals(1, aaaaRecordSets.stream().count()); Assertions.assertTrue(aaaaRecordSets.iterator().next().name().startsWith("www")); - Assertions.assertTrue(aaaaRecordSets.iterator().next().ipv6Addresses().size() == 2); + Assertions.assertEquals(2, aaaaRecordSets.iterator().next().ipv6Addresses().size()); // Check MX records PagedIterable mxRecordSets = dnsZone.mxRecordSets().list(); - Assertions.assertTrue(mxRecordSets.stream().count() == 1); + Assertions.assertEquals(1, mxRecordSets.stream().count()); MxRecordSet mxRecordSet = mxRecordSets.iterator().next(); Assertions.assertNotNull(mxRecordSet); Assertions.assertTrue(mxRecordSet.name().startsWith("email")); - Assertions.assertTrue(mxRecordSet.metadata().size() == 2); - Assertions.assertTrue(mxRecordSet.records().size() == 2); + Assertions.assertEquals(2, mxRecordSet.metadata().size()); + Assertions.assertEquals(2, mxRecordSet.records().size()); for (MxRecord mxRecord : mxRecordSet.records()) { Assertions.assertTrue(mxRecord.exchange().startsWith("mail.contoso-mail-exchange1.com") || mxRecord.exchange().startsWith("mail.contoso-mail-exchange2.com")); @@ -132,23 +136,23 @@ public DnsZone createResource(DnsZones dnsZones) throws Exception { // Check NS records PagedIterable nsRecordSets = dnsZone.nsRecordSets().list(); - Assertions.assertTrue(nsRecordSets.stream().count() == 2); // One created above with name 'partners' + the default '@' + Assertions.assertEquals(2, nsRecordSets.stream().count()); // One created above with name 'partners' + the default '@' // Check TXT records PagedIterable txtRecordSets = dnsZone.txtRecordSets().list(); - Assertions.assertTrue(txtRecordSets.stream().count() == 2); + Assertions.assertEquals(2, txtRecordSets.stream().count()); // Check SRV records PagedIterable srvRecordSets = dnsZone.srvRecordSets().list(); - Assertions.assertTrue(srvRecordSets.stream().count() == 1); + Assertions.assertEquals(1, srvRecordSets.stream().count()); // Check PTR records PagedIterable ptrRecordSets = dnsZone.ptrRecordSets().list(); - Assertions.assertTrue(ptrRecordSets.stream().count() == 2); + Assertions.assertEquals(2, ptrRecordSets.stream().count()); // Check CNAME records PagedIterable cnameRecordSets = dnsZone.cNameRecordSets().list(); - Assertions.assertTrue(cnameRecordSets.stream().count() == 2); + Assertions.assertEquals(2, cnameRecordSets.stream().count()); // Check Generic record set listing PagedIterable recordSets = dnsZone.listRecordSets(); @@ -214,15 +218,15 @@ public DnsZone createResource(DnsZones dnsZones) throws Exception { Assertions.assertNotNull(recordSet); } } - Assertions.assertTrue(typeToCount.get(SOA) == 1); - Assertions.assertTrue(typeToCount.get(RecordType.A) == 1); - Assertions.assertTrue(typeToCount.get(AAAA) == 1); - Assertions.assertTrue(typeToCount.get(MX) == 1); - Assertions.assertTrue(typeToCount.get(NS) == 2); - Assertions.assertTrue(typeToCount.get(TXT) == 2); - Assertions.assertTrue(typeToCount.get(SRV) == 1); - Assertions.assertTrue(typeToCount.get(PTR) == 2); - Assertions.assertTrue(typeToCount.get(RecordType.CNAME) == 2); + Assertions.assertEquals(1, (int) typeToCount.get(SOA)); + Assertions.assertEquals(1, (int) typeToCount.get(RecordType.A)); + Assertions.assertEquals(1, (int) typeToCount.get(AAAA)); + Assertions.assertEquals(1, (int) typeToCount.get(MX)); + Assertions.assertEquals(2, (int) typeToCount.get(NS)); + Assertions.assertEquals(2, (int) typeToCount.get(TXT)); + Assertions.assertEquals(1, (int) typeToCount.get(SRV)); + Assertions.assertEquals(2, (int) typeToCount.get(PTR)); + Assertions.assertEquals(2, (int) typeToCount.get(RecordType.CNAME)); return dnsZone; } @@ -269,7 +273,7 @@ public DnsZone updateResource(DnsZone dnsZone) throws Exception { // Check NS records PagedIterable nsRecordSets = dnsZone.nsRecordSets().list(); - Assertions.assertTrue(nsRecordSets.stream().count() == 2); // One created above with name 'partners' + the default '@' + Assertions.assertEquals(2, nsRecordSets.stream().count()); // One created above with name 'partners' + the default '@' for (NsRecordSet nsRecordSet : nsRecordSets) { Assertions.assertTrue(nsRecordSet.name().startsWith("partners") || nsRecordSet.name().startsWith("@")); if (nsRecordSet.name().startsWith("partners")) { @@ -291,9 +295,9 @@ public DnsZone updateResource(DnsZone dnsZone) throws Exception { // Check SRV records PagedIterable srvRecordSets = dnsZone.srvRecordSets().list(); - Assertions.assertTrue(srvRecordSets.stream().count() == 1); + Assertions.assertEquals(1, srvRecordSets.stream().count()); SrvRecordSet srvRecordSet = srvRecordSets.iterator().next(); - Assertions.assertTrue(srvRecordSet.records().size() == 4); + Assertions.assertEquals(4, srvRecordSet.records().size()); for (SrvRecord srvRecord : srvRecordSet.records()) { Assertions.assertFalse(srvRecord.target().startsWith("bigbox.contoso-service.com")); } @@ -304,11 +308,11 @@ public DnsZone updateResource(DnsZone dnsZone) throws Exception { SoaRecord soaRecord = soaRecordSet.record(); Assertions.assertNotNull(soaRecord); Assertions.assertEquals(soaRecord.minimumTtl(), Long.valueOf(600)); - Assertions.assertTrue(soaRecordSet.timeToLive() == 7200); + Assertions.assertEquals(7200, soaRecordSet.timeToLive()); // Check MX records PagedIterable mxRecordSets = dnsZone.mxRecordSets().list(); - Assertions.assertTrue(mxRecordSets.stream().count() == 2); + Assertions.assertEquals(2, mxRecordSets.stream().count()); dnsZone.update() .updateMXRecordSet("email") @@ -320,11 +324,11 @@ public DnsZone updateResource(DnsZone dnsZone) throws Exception { .withTag("d", "dd") .apply(); - Assertions.assertTrue(dnsZone.tags().size() == 3); + Assertions.assertEquals(3, dnsZone.tags().size()); // Check "mail" MX record MxRecordSet mxRecordSet = dnsZone.mxRecordSets().getByName("email"); - Assertions.assertTrue(mxRecordSet.records().size() == 1); - Assertions.assertTrue(mxRecordSet.metadata().size() == 3); + Assertions.assertEquals(1, mxRecordSet.records().size()); + Assertions.assertEquals(3, mxRecordSet.metadata().size()); Assertions.assertTrue(mxRecordSet.records().get(0).exchange().startsWith("mail.contoso-mail-exchange1.com")); return dnsZone; @@ -452,11 +456,11 @@ public void print(DnsZone dnsZone) { .append("\n\t\tTTL (seconds): ").append(txtRecordSet.timeToLive()) .append("\n\t\tRecords: "); for (TxtRecord txtRecord : txtRecordSet.records()) { - if (txtRecord.value().size() > 0) { + if (!txtRecord.value().isEmpty()) { info.append("\n\t\t\tValue: ").append(txtRecord.value().get(0)); } } } - System.out.println(info.toString()); + LOGGER.log(LogLevel.VERBOSE, () -> info.toString()); } } diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestExpressRouteCircuit.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestExpressRouteCircuit.java index 8226a805d24f..6c0edc1c2499 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestExpressRouteCircuit.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestExpressRouteCircuit.java @@ -3,6 +3,8 @@ package com.azure.resourcemanager; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.resourcemanager.network.models.ExpressRouteCircuit; import com.azure.resourcemanager.network.models.ExpressRouteCircuitSkuType; import com.azure.resourcemanager.network.models.ExpressRouteCircuits; @@ -13,6 +15,8 @@ /** Tests Express Route Circuit. */ public class TestExpressRouteCircuit { + private static final ClientLogger LOGGER = new ClientLogger(TestExpressRouteCircuit.class); + private String testId = ""; private static final Region REGION = Region.ASIA_SOUTHEAST; private String circuitName; @@ -54,7 +58,7 @@ public ExpressRouteCircuit updateResource(ExpressRouteCircuit resource) throws E .apply(); resource.refresh(); Assertions.assertTrue(resource.tags().containsKey("tag2")); - Assertions.assertTrue(!resource.tags().containsKey("tag1")); + Assertions.assertFalse(resource.tags().containsKey("tag1")); Assertions.assertEquals(Integer.valueOf(200), resource.serviceProviderProperties().bandwidthInMbps()); Assertions.assertEquals(ExpressRouteCircuitSkuType.PREMIUM_UNLIMITEDDATA, resource.sku()); @@ -131,18 +135,8 @@ public void print(ExpressRouteCircuit resource) { } private static void printExpressRouteCircuit(ExpressRouteCircuit resource) { - StringBuilder info = new StringBuilder(); - info - .append("Express Route Circuit: ") - .append(resource.id()) - .append("\n\tName: ") - .append(resource.name()) - .append("\n\tResource group: ") - .append(resource.resourceGroupName()) - .append("\n\tRegion: ") - .append(resource.regionName()) - .append("\n\tTags: ") - .append(resource.tags()); - System.out.println(info.toString()); + LOGGER.log(LogLevel.VERBOSE, () -> "Express Route Circuit: " + resource.id() + "\n\tName: " + resource.name() + + "\n\tResource group: " + resource.resourceGroupName() + "\n\tRegion: " + resource.regionName() + + "\n\tTags: " + resource.tags()); } } diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestLoadBalancer.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestLoadBalancer.java index 867de9bf56c5..5683b621229c 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestLoadBalancer.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestLoadBalancer.java @@ -2,6 +2,8 @@ // Licensed under the MIT License. package com.azure.resourcemanager; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.resourcemanager.compute.models.AvailabilitySet; import com.azure.resourcemanager.compute.models.AvailabilitySetSkuTypes; import com.azure.resourcemanager.compute.models.KnownLinuxVirtualMachineImage; @@ -45,6 +47,8 @@ /** Test of load balancer management. */ public class TestLoadBalancer { + private static final ClientLogger LOGGER = new ClientLogger(TestLoadBalancer.class); + String testId = ""; Region region = Region.US_WEST; String groupName = ""; @@ -367,10 +371,10 @@ public LoadBalancer updateResource(LoadBalancer resource) throws Exception { // Remove the NIC associations nic1.update().withoutLoadBalancerBackends().withoutLoadBalancerInboundNatRules().apply(); - Assertions.assertTrue(nic1.primaryIPConfiguration().listAssociatedLoadBalancerBackends().size() == 0); + Assertions.assertEquals(0, nic1.primaryIPConfiguration().listAssociatedLoadBalancerBackends().size()); nic2.update().withoutLoadBalancerBackends().withoutLoadBalancerInboundNatRules().apply(); - Assertions.assertTrue(nic2.primaryIPConfiguration().listAssociatedLoadBalancerBackends().size() == 0); + Assertions.assertEquals(0, nic2.primaryIPConfiguration().listAssociatedLoadBalancerBackends().size()); // Update the load balancer ensurePIPs(resource.manager().publicIpAddresses()); @@ -542,7 +546,7 @@ public LoadBalancer updateResource(LoadBalancer resource) throws Exception { // Verify backends Assertions.assertTrue(resource.backends().containsKey("backend2")); - Assertions.assertTrue(!resource.backends().containsKey(backend.name())); + Assertions.assertFalse(resource.backends().containsKey(backend.name())); // Verify NAT rules Assertions.assertTrue(resource.inboundNatRules().isEmpty()); @@ -705,7 +709,7 @@ public LoadBalancer updateResource(LoadBalancer resource) throws Exception { // Verify backends Assertions.assertEquals(1, resource.backends().size()); Assertions.assertTrue(resource.backends().containsKey("backend2")); - Assertions.assertTrue(!resource.backends().containsKey(backend.name())); + Assertions.assertFalse(resource.backends().containsKey(backend.name())); // Verify load balancing rules lbRule = resource.loadBalancingRules().get("lbrule1"); @@ -1023,23 +1027,18 @@ public LoadBalancer updateResource(LoadBalancer resource) throws Exception { } // Create VNet for the LB - private Map ensurePIPs(PublicIpAddresses pips) throws Exception { + private Map ensurePIPs(PublicIpAddresses pips) { List> creatablePips = new ArrayList<>(); - for (int i = 0; i < pipNames.length; i++) { - creatablePips - .add( - pips - .define(pipNames[i]) - .withRegion(region) - .withNewResourceGroup(groupName) - .withLeafDomainLabel(pipNames[i])); + for (String pipName : pipNames) { + creatablePips.add( + pips.define(pipName).withRegion(region).withNewResourceGroup(groupName).withLeafDomainLabel(pipName)); } return pips.create(creatablePips); } // Ensure VMs for the LB - private VirtualMachine[] ensureVMs(Networks networks, ComputeManager computeManager, int count) throws Exception { + private VirtualMachine[] ensureVMs(Networks networks, ComputeManager computeManager, int count) { // Create a network for the VMs Network network = networks @@ -1311,9 +1310,9 @@ static void printLB(LoadBalancer resource) { // Show assigned load balancing rules info .append("\n\t\t\tReferenced load balancing rules: ") - .append(new ArrayList(backend.loadBalancingRules().keySet())); + .append(new ArrayList<>(backend.loadBalancingRules().keySet())); } - System.out.println(info.toString()); + LOGGER.log(LogLevel.VERBOSE, info::toString); } } diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestLocalNetworkGateway.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestLocalNetworkGateway.java index c8bf6a47f705..952f5b94bd8a 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestLocalNetworkGateway.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestLocalNetworkGateway.java @@ -2,6 +2,8 @@ // Licensed under the MIT License. package com.azure.resourcemanager; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.resourcemanager.network.models.LocalNetworkGateway; import com.azure.resourcemanager.network.models.LocalNetworkGateways; import com.azure.core.management.Region; @@ -10,6 +12,8 @@ /** Tests Local Network Gateway. */ public class TestLocalNetworkGateway extends TestTemplate { + private static final ClientLogger LOGGER = new ClientLogger(TestLocalNetworkGateway.class); + private String testId = ""; private static final Region REGION = Region.US_NORTH_CENTRAL; private String groupName; @@ -51,7 +55,7 @@ public LocalNetworkGateway updateResource(LocalNetworkGateway gateway) throws Ex Assertions.assertFalse(gateway.addressSpaces().contains("192.168.3.0/24")); Assertions.assertEquals("40.71.184.216", gateway.ipAddress()); Assertions.assertTrue(gateway.tags().containsKey("tag2")); - Assertions.assertTrue(!gateway.tags().containsKey("tag1")); + Assertions.assertFalse(gateway.tags().containsKey("tag1")); gateway.updateTags().withoutTag("tag2").withTag("tag3", "value3").applyTags(); Assertions.assertFalse(gateway.tags().containsKey("tag2")); Assertions.assertEquals("value3", gateway.tags().get("tag3")); @@ -75,10 +79,10 @@ public void print(LocalNetworkGateway gateway) { if (!gateway.addressSpaces().isEmpty()) { info.append("\n\tAddress spaces:"); for (String addressSpace : gateway.addressSpaces()) { - info.append("\n\t\t" + addressSpace); + info.append("\n\t\t").append(addressSpace); } } info.append("\n\tTags: ").append(gateway.tags()); - System.out.println(info.toString()); + LOGGER.log(LogLevel.VERBOSE, info::toString); } } diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestNSG.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestNSG.java index 912d39298b15..233d88f9c0ac 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestNSG.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestNSG.java @@ -2,6 +2,8 @@ // Licensed under the MIT License. package com.azure.resourcemanager; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.resourcemanager.network.models.ApplicationSecurityGroup; import com.azure.resourcemanager.network.models.NetworkInterface; import com.azure.resourcemanager.network.models.NetworkSecurityGroup; @@ -17,6 +19,8 @@ /** Test for network security group CRUD. */ public class TestNSG extends TestTemplate { + private static final ClientLogger LOGGER = new ClientLogger(TestNSG.class); + @Override public NetworkSecurityGroup createResource(NetworkSecurityGroups nsgs) throws Exception { String postFix = nsgs.manager().resourceManager().internalContext().randomResourceName("", 8); @@ -61,7 +65,7 @@ public NetworkSecurityGroup createResource(NetworkSecurityGroups nsgs) throws Ex .createAsync(); resourceStream - .doOnSuccess((_ignore) -> System.out.print("completed")); + .doOnSuccess((_ignore) -> LOGGER.log(LogLevel.VERBOSE, () -> "completed")); NetworkSecurityGroup nsg = resourceStream.block(); @@ -80,8 +84,8 @@ public NetworkSecurityGroup createResource(NetworkSecurityGroups nsgs) throws Ex nsg.refresh(); // Verify - Assertions.assertTrue(nsg.region().equals(region)); - Assertions.assertTrue(nsg.securityRules().size() == 2); + Assertions.assertEquals(nsg.region(), region); + Assertions.assertEquals(2, nsg.securityRules().size()); // Confirm NIC association Assertions.assertEquals(1, nsg.networkInterfaceIds().size()); @@ -191,7 +195,7 @@ public static void printNSG(NetworkSecurityGroup resource) { // Output associated subnets info.append("\n\tAssociated subnets: "); List subnets = resource.listAssociatedSubnets(); - if (subnets == null || subnets.size() == 0) { + if (subnets == null || subnets.isEmpty()) { info.append("(None)"); } else { for (Subnet subnet : subnets) { @@ -203,7 +207,7 @@ public static void printNSG(NetworkSecurityGroup resource) { } } - System.out.println(info.toString()); + LOGGER.log(LogLevel.VERBOSE, info::toString); } @Override diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestNetwork.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestNetwork.java index 9cba6692de9f..61e2ca7f1120 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestNetwork.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestNetwork.java @@ -2,6 +2,8 @@ // Licensed under the MIT License. package com.azure.resourcemanager; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.resourcemanager.network.models.Network; import com.azure.resourcemanager.network.models.NetworkPeering; import com.azure.resourcemanager.network.models.NetworkPeeringGatewayUse; @@ -23,6 +25,8 @@ /** Test of virtual network management. */ public class TestNetwork { + private static final ClientLogger LOGGER = new ClientLogger(TestNetwork.class); + /** Test of network with subnets. */ public class WithSubnets extends TestTemplate { @Override @@ -484,13 +488,13 @@ public static void printNetwork(Network resource) { // Output services with access Map> services = subnet.servicesWithAccess(); - if (services.size() > 0) { + if (!services.isEmpty()) { info.append("\n\tServices with access"); for (Map.Entry> service : services.entrySet()) { - info - .append("\n\t\tService: ") + info.append("\n\t\tService: ") .append(service.getKey()) - .append(" Regions: " + service.getValue() + ""); + .append(" Regions: ") + .append(service.getValue()); } } } @@ -512,6 +516,6 @@ public static void printNetwork(Network resource) { .append(peering.gatewayUse()); } - System.out.println(info.toString()); + LOGGER.log(LogLevel.VERBOSE, info::toString); } } diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestNetworkInterface.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestNetworkInterface.java index e06d10395e17..49a9451b3333 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestNetworkInterface.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestNetworkInterface.java @@ -2,6 +2,8 @@ // Licensed under the MIT License. package com.azure.resourcemanager; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.resourcemanager.network.models.LoadBalancerBackend; import com.azure.resourcemanager.network.models.LoadBalancerInboundNatRule; import com.azure.resourcemanager.network.models.Network; @@ -15,6 +17,8 @@ import org.junit.jupiter.api.Assertions; public class TestNetworkInterface extends TestTemplate { + private static final ClientLogger LOGGER = new ClientLogger(TestNetworkInterface.class); + @Override public NetworkInterface createResource(NetworkInterfaces networkInterfaces) throws Exception { @@ -199,7 +203,7 @@ public static void printNic(NetworkInterface resource) { } } - System.out.println(info.toString()); + LOGGER.log(LogLevel.VERBOSE, info::toString); } @Override diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestNetworkWatcher.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestNetworkWatcher.java index 1897af7112fa..27fe629849b1 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestNetworkWatcher.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestNetworkWatcher.java @@ -3,6 +3,8 @@ package com.azure.resourcemanager; import com.azure.core.http.rest.PagedIterable; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.resourcemanager.compute.models.KnownLinuxVirtualMachineImage; import com.azure.resourcemanager.compute.models.VirtualMachine; import com.azure.resourcemanager.compute.models.VirtualMachineSizeTypes; @@ -28,6 +30,8 @@ /** Tests Network Watcher. */ public class TestNetworkWatcher extends TestTemplate { + private static final ClientLogger LOGGER = new ClientLogger(TestNetworkWatcher.class); + private String testId = ""; private static final Region REGION = Region.EUROPE_NORTH; private String groupName; @@ -169,19 +173,9 @@ StorageAccount ensureStorageAccount(StorageAccounts storageAccounts) { @Override public void print(NetworkWatcher nw) { - StringBuilder info = new StringBuilder(); - info - .append("Network Watcher: ") - .append(nw.id()) - .append("\n\tName: ") - .append(nw.name()) - .append("\n\tResource group: ") - .append(nw.resourceGroupName()) - .append("\n\tRegion: ") - .append(nw.regionName()) - .append("\n\tTags: ") - .append(nw.tags()); - System.out.println(info.toString()); + LOGGER.log(LogLevel.VERBOSE, () -> "Network Watcher: " + nw.id() + "\n\tName: " + nw.name() + + "\n\tResource group: " + nw.resourceGroupName() + "\n\tRegion: " + nw.regionName() + "\n\tTags: " + + nw.tags()); } public String groupName() { diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestPrivateDns.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestPrivateDns.java index c31fdd62a87e..01ae80cd352f 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestPrivateDns.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestPrivateDns.java @@ -3,6 +3,8 @@ package com.azure.resourcemanager; import com.azure.core.http.rest.PagedIterable; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.resourcemanager.privatedns.models.ARecordSet; import com.azure.resourcemanager.privatedns.models.AaaaRecordSet; import com.azure.resourcemanager.privatedns.models.CnameRecordSet; @@ -32,6 +34,8 @@ import static com.azure.resourcemanager.privatedns.models.RecordType.TXT; public class TestPrivateDns extends TestTemplate { + private static final ClientLogger LOGGER = new ClientLogger(TestPrivateDns.class); + @Override public PrivateDnsZone createResource(PrivateDnsZones resources) throws Exception { final Region region = Region.US_EAST; @@ -84,7 +88,7 @@ public PrivateDnsZone createResource(PrivateDnsZones resources) throws Exception // Check Dns zone properties Assertions.assertTrue(resource.name().startsWith(topLevelDomain)); - Assertions.assertTrue(resource.tags().size() == 2); + Assertions.assertEquals(2, resource.tags().size()); // Check SOA record - external child resource (created by default) SoaRecordSet soaRecordSet = resource.getSoaRecordSet(); @@ -97,23 +101,23 @@ public PrivateDnsZone createResource(PrivateDnsZones resources) throws Exception // Check A records PagedIterable aRecordSets = resource.aRecordSets().list(); - Assertions.assertTrue(aRecordSets.stream().count() == 1); - Assertions.assertTrue(aRecordSets.iterator().next().timeToLive() == 7200); + Assertions.assertEquals(1, aRecordSets.stream().count()); + Assertions.assertEquals(7200, aRecordSets.iterator().next().timeToLive()); // Check AAAA records PagedIterable aaaaRecordSets = resource.aaaaRecordSets().list(); - Assertions.assertTrue(aaaaRecordSets.stream().count() == 1); + Assertions.assertEquals(1, aaaaRecordSets.stream().count()); Assertions.assertTrue(aaaaRecordSets.iterator().next().name().startsWith("www")); - Assertions.assertTrue(aaaaRecordSets.iterator().next().ipv6Addresses().size() == 2); + Assertions.assertEquals(2, aaaaRecordSets.iterator().next().ipv6Addresses().size()); // Check MX records PagedIterable mxRecordSets = resource.mxRecordSets().list(); - Assertions.assertTrue(mxRecordSets.stream().count() == 1); + Assertions.assertEquals(1, mxRecordSets.stream().count()); MxRecordSet mxRecordSet = mxRecordSets.iterator().next(); Assertions.assertNotNull(mxRecordSet); Assertions.assertTrue(mxRecordSet.name().startsWith("email")); - Assertions.assertTrue(mxRecordSet.metadata().size() == 2); - Assertions.assertTrue(mxRecordSet.records().size() == 2); + Assertions.assertEquals(2, mxRecordSet.metadata().size()); + Assertions.assertEquals(2, mxRecordSet.records().size()); for (MxRecord mxRecord : mxRecordSet.records()) { Assertions.assertTrue(mxRecord.exchange().startsWith("mail.contoso-mail-exchange1.com") || mxRecord.exchange().startsWith("mail.contoso-mail-exchange2.com")); @@ -123,19 +127,19 @@ public PrivateDnsZone createResource(PrivateDnsZones resources) throws Exception // Check TXT records PagedIterable txtRecordSets = resource.txtRecordSets().list(); - Assertions.assertTrue(txtRecordSets.stream().count() == 2); + Assertions.assertEquals(2, txtRecordSets.stream().count()); // Check SRV records PagedIterable srvRecordSets = resource.srvRecordSets().list(); - Assertions.assertTrue(srvRecordSets.stream().count() == 1); + Assertions.assertEquals(1, srvRecordSets.stream().count()); // Check PTR records PagedIterable ptrRecordSets = resource.ptrRecordSets().list(); - Assertions.assertTrue(ptrRecordSets.stream().count() == 2); + Assertions.assertEquals(2, ptrRecordSets.stream().count()); // Check CNAME records PagedIterable cnameRecordSets = resource.cnameRecordSets().list(); - Assertions.assertTrue(cnameRecordSets.stream().count() == 2); + Assertions.assertEquals(2, cnameRecordSets.stream().count()); // Check Generic record set listing PagedIterable recordSets = resource.listRecordSets(); @@ -195,14 +199,14 @@ public PrivateDnsZone createResource(PrivateDnsZones resources) throws Exception Assertions.assertNotNull(recordSet); } } - Assertions.assertTrue(typeToCount.get(SOA) == 1); - Assertions.assertTrue(typeToCount.get(RecordType.A) == 1); - Assertions.assertTrue(typeToCount.get(AAAA) == 1); - Assertions.assertTrue(typeToCount.get(MX) == 1); - Assertions.assertTrue(typeToCount.get(TXT) == 2); - Assertions.assertTrue(typeToCount.get(SRV) == 1); - Assertions.assertTrue(typeToCount.get(PTR) == 2); - Assertions.assertTrue(typeToCount.get(RecordType.CNAME) == 2); + Assertions.assertEquals(1, (int) typeToCount.get(SOA)); + Assertions.assertEquals(1, (int) typeToCount.get(RecordType.A)); + Assertions.assertEquals(1, (int) typeToCount.get(AAAA)); + Assertions.assertEquals(1, (int) typeToCount.get(MX)); + Assertions.assertEquals(2, (int) typeToCount.get(TXT)); + Assertions.assertEquals(1, (int) typeToCount.get(SRV)); + Assertions.assertEquals(2, (int) typeToCount.get(PTR)); + Assertions.assertEquals(2, (int) typeToCount.get(RecordType.CNAME)); return resource; } @@ -254,9 +258,9 @@ public PrivateDnsZone updateResource(PrivateDnsZone resource) throws Exception { // Check SRV records PagedIterable srvRecordSets = resource.srvRecordSets().list(); - Assertions.assertTrue(srvRecordSets.stream().count() == 1); + Assertions.assertEquals(1, srvRecordSets.stream().count()); SrvRecordSet srvRecordSet = srvRecordSets.iterator().next(); - Assertions.assertTrue(srvRecordSet.records().size() == 4); + Assertions.assertEquals(4, srvRecordSet.records().size()); for (SrvRecord srvRecord : srvRecordSet.records()) { Assertions.assertFalse(srvRecord.target().startsWith("bigbox.contoso-service.com")); } @@ -267,11 +271,11 @@ public PrivateDnsZone updateResource(PrivateDnsZone resource) throws Exception { SoaRecord soaRecord = soaRecordSet.record(); Assertions.assertNotNull(soaRecord); Assertions.assertEquals(soaRecord.minimumTtl(), Long.valueOf(600)); - Assertions.assertTrue(soaRecordSet.timeToLive() == 7200); + Assertions.assertEquals(7200, soaRecordSet.timeToLive()); // Check MX records PagedIterable mxRecordSets = resource.mxRecordSets().list(); - Assertions.assertTrue(mxRecordSets.stream().count() == 2); + Assertions.assertEquals(2, mxRecordSets.stream().count()); resource.update() .updateMxRecordSet("email") @@ -283,11 +287,11 @@ public PrivateDnsZone updateResource(PrivateDnsZone resource) throws Exception { .withTag("d", "dd") .apply(); - Assertions.assertTrue(resource.tags().size() == 3); + Assertions.assertEquals(3, resource.tags().size()); // Check "mail" MX record MxRecordSet mxRecordSet = resource.mxRecordSets().getByName("email"); - Assertions.assertTrue(mxRecordSet.records().size() == 1); - Assertions.assertTrue(mxRecordSet.metadata().size() == 3); + Assertions.assertEquals(1, mxRecordSet.records().size()); + Assertions.assertEquals(3, mxRecordSet.metadata().size()); Assertions.assertTrue(mxRecordSet.records().get(0).exchange().startsWith("mail.contoso-mail-exchange1.com")); return resource; @@ -399,11 +403,11 @@ public void print(PrivateDnsZone resource) { .append("\n\t\tTTL (seconds): ").append(txtRecordSet.timeToLive()) .append("\n\t\tRecords: "); for (TxtRecord txtRecord : txtRecordSet.records()) { - if (txtRecord.value().size() > 0) { + if (!txtRecord.value().isEmpty()) { info.append("\n\t\t\tValue: ").append(txtRecord.value().get(0)); } } } - System.out.println(info.toString()); + LOGGER.log(LogLevel.VERBOSE, info::toString); } } diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestPublicIPAddress.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestPublicIPAddress.java index 0d0b58b9436d..bcea20410bed 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestPublicIPAddress.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestPublicIPAddress.java @@ -2,6 +2,8 @@ // Licensed under the MIT License. package com.azure.resourcemanager; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.resourcemanager.network.models.LoadBalancer; import com.azure.resourcemanager.network.models.LoadBalancerPublicFrontend; import com.azure.resourcemanager.network.models.NetworkInterface; @@ -13,6 +15,8 @@ /** Tests public IPs. */ public class TestPublicIPAddress extends TestTemplate { + private static final ClientLogger LOGGER = new ClientLogger(TestPublicIPAddress.class); + @Override public PublicIpAddress createResource(PublicIpAddresses pips) throws Exception { final String newPipName = pips.manager().resourceManager().internalContext().randomResourceName("pip", 10); @@ -44,7 +48,7 @@ public PublicIpAddress updateResource(PublicIpAddress resource) throws Exception .withTag("tag2", "value2") .apply(); Assertions.assertTrue(resource.leafDomainLabel().equalsIgnoreCase(updatedDnsName)); - Assertions.assertTrue(resource.idleTimeoutInMinutes() == updatedIdleTimeout); + Assertions.assertEquals(updatedIdleTimeout, resource.idleTimeoutInMinutes()); Assertions.assertEquals("value2", resource.tags().get("tag2")); resource.updateTags().withoutTag("tag1").withTag("tag3", "value3").applyTags(); @@ -114,6 +118,6 @@ public static void printPIP(PublicIpAddress resource) { info.append("(None)"); } - System.out.println(info.toString()); + LOGGER.log(LogLevel.VERBOSE, info::toString); } } diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestPublicIPPrefix.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestPublicIPPrefix.java index 645230b91671..c0d30fe6f0bb 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestPublicIPPrefix.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestPublicIPPrefix.java @@ -3,6 +3,8 @@ package com.azure.resourcemanager; import com.azure.core.management.SubResource; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.resourcemanager.network.models.IpVersion; import com.azure.resourcemanager.network.models.PublicIpPrefix; import com.azure.resourcemanager.network.models.PublicIpPrefixSku; @@ -13,6 +15,8 @@ /** Tests public Prefixes. */ public class TestPublicIPPrefix extends TestTemplate { + private static final ClientLogger LOGGER = new ClientLogger(TestPublicIPPrefix.class); + @Override public PublicIpPrefix createResource(PublicIpPrefixes pips) throws Exception { final String newPipName = pips.manager().resourceManager().internalContext().randomResourceName("pip", 10); @@ -26,7 +30,7 @@ public PublicIpPrefix createResource(PublicIpPrefixes pips) throws Exception { Assertions.assertEquals(pip.prefixLength(), (Integer) 28); Assertions.assertEquals(pip.sku().name().toString(), "Standard"); - Assertions.assertTrue(pip.publicIpAddressVersion() == IpVersion.IPV4); + Assertions.assertSame(pip.publicIpAddressVersion(), IpVersion.IPV4); return pip; } @@ -67,6 +71,6 @@ public static void printPIP(PublicIpPrefix resource) { info.append("(None)"); } - System.out.println(info.toString()); + LOGGER.log(LogLevel.VERBOSE, info::toString); } } diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestRedis.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestRedis.java index 6bdc52bdad11..e2030b9d1324 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestRedis.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestRedis.java @@ -3,6 +3,8 @@ package com.azure.resourcemanager; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.resourcemanager.redis.models.RedisCache; import com.azure.resourcemanager.redis.models.RedisCaches; import com.azure.core.management.Region; @@ -10,6 +12,8 @@ import reactor.core.publisher.Mono; public class TestRedis extends TestTemplate { + private static final ClientLogger LOGGER = new ClientLogger(TestRedis.class); + @Override public RedisCache createResource(RedisCaches resources) throws Exception { final String redisName = resources.manager().resourceManager().internalContext().randomResourceName("redis", 10); @@ -43,6 +47,6 @@ public RedisCache updateResource(RedisCache resource) throws Exception { @Override public void print(RedisCache resource) { - System.out.println("Redis Cache: " + resource.id() + ", Name: " + resource.name()); + LOGGER.log(LogLevel.VERBOSE, () -> "Redis Cache: " + resource.id() + ", Name: " + resource.name()); } } diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestRouteTables.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestRouteTables.java index 551f63d06731..1ea70731a0ea 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestRouteTables.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestRouteTables.java @@ -2,6 +2,8 @@ // Licensed under the MIT License. package com.azure.resourcemanager; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.resourcemanager.network.models.Route; import com.azure.resourcemanager.network.models.RouteNextHopType; import com.azure.resourcemanager.network.models.RouteTable; @@ -15,6 +17,8 @@ /** Test of virtual network management. */ public class TestRouteTables { + private static final ClientLogger LOGGER = new ClientLogger(TestRouteTables.class); + private String route1Name = "route1"; private String route2Name = "route2"; private String routeAddedName = "route3"; @@ -58,13 +62,13 @@ public RouteTable createResource(RouteTables routeTables) throws Exception { Route route1 = routeTable.routes().get(route1Name); Assertions.assertTrue(route1.destinationAddressPrefix().equalsIgnoreCase(route1AddressPrefix)); Assertions.assertTrue(route1.nextHopIpAddress().equalsIgnoreCase(virtualApplianceIp)); - Assertions.assertTrue(route1.nextHopType().equals(RouteNextHopType.VIRTUAL_APPLIANCE)); + Assertions.assertEquals(route1.nextHopType(), RouteNextHopType.VIRTUAL_APPLIANCE); Assertions.assertTrue(routeTable.routes().containsKey(route2Name)); Route route2 = routeTable.routes().get(route2Name); Assertions.assertTrue(route2.destinationAddressPrefix().equalsIgnoreCase(route2AddressPrefix)); - Assertions.assertTrue(route2.nextHopIpAddress() == null); - Assertions.assertTrue(route2.nextHopType().equals(hopType)); + Assertions.assertNull(route2.nextHopIpAddress()); + Assertions.assertEquals(route2.nextHopType(), hopType); Assertions.assertTrue(routeTable.isBgpRoutePropagationDisabled()); @@ -83,7 +87,7 @@ public RouteTable createResource(RouteTables routeTables) throws Exception { .create(); List subnets = routeTable.refresh().listAssociatedSubnets(); - Assertions.assertTrue(subnets.size() == 1); + Assertions.assertEquals(1, subnets.size()); Assertions.assertTrue(subnets.get(0).routeTableId().equalsIgnoreCase(routeTable.id())); return routeTable; } @@ -110,7 +114,7 @@ public RouteTable updateResource(RouteTable routeTable) throws Exception { Assertions.assertTrue(routeTable.tags().containsKey("tag1")); Assertions.assertTrue(routeTable.tags().containsKey("tag2")); - Assertions.assertTrue(!routeTable.routes().containsKey(route1Name)); + Assertions.assertFalse(routeTable.routes().containsKey(route1Name)); Assertions.assertTrue(routeTable.routes().containsKey(route2Name)); Assertions.assertTrue(routeTable.routes().containsKey(routeAddedName)); Assertions.assertFalse(routeTable.isBgpRoutePropagationDisabled()); @@ -126,7 +130,7 @@ public RouteTable updateResource(RouteTable routeTable) throws Exception { .apply(); List subnets = routeTable.refresh().listAssociatedSubnets(); - Assertions.assertTrue(subnets.size() == 0); + Assertions.assertEquals(0, subnets.size()); routeTable.updateTags().withoutTag("tag1").withTag("tag3", "value3").applyTags(); Assertions.assertFalse(routeTable.tags().containsKey("tag1")); @@ -189,6 +193,6 @@ public static void printRouteTable(RouteTable resource) { .append(subnet.routeTableId()); } info.append("\n\tDisable BGP route propagation: ").append(resource.isBgpRoutePropagationDisabled()); - System.out.println(info.toString()); + LOGGER.log(LogLevel.VERBOSE, info::toString); } } diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestSearchService.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestSearchService.java index d7cda788cbb8..ef6b4a52d942 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestSearchService.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestSearchService.java @@ -5,6 +5,8 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.core.management.Region; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.resourcemanager.search.models.AdminKeyKind; import com.azure.resourcemanager.search.models.AdminKeys; import com.azure.resourcemanager.search.models.QueryKey; @@ -15,6 +17,7 @@ import org.junit.jupiter.api.Assertions; public class TestSearchService { + private static final ClientLogger LOGGER = new ClientLogger(TestSearchService.class); /** * Search service test. @@ -61,7 +64,7 @@ public SearchService updateResource(SearchService resource) throws Exception { .withPartitionCount(1) .apply(); Assertions.assertTrue(resource.tags().containsKey("tag2")); - Assertions.assertTrue(!resource.tags().containsKey("tag1")); + Assertions.assertFalse(resource.tags().containsKey("tag1")); Assertions.assertEquals(1, resource.replicaCount()); Assertions.assertEquals(1, resource.partitionCount()); Assertions.assertEquals(2, TestUtilities.getSize(resource.listQueryKeys())); @@ -117,7 +120,7 @@ public SearchService updateResource(SearchService resource) throws Exception { .withoutTag("tag1") .apply(); Assertions.assertTrue(resource.tags().containsKey("tag2")); - Assertions.assertTrue(!resource.tags().containsKey("tag1")); + Assertions.assertFalse(resource.tags().containsKey("tag1")); return resource; } @@ -158,7 +161,7 @@ public SearchService updateResource(SearchService resource) throws Exception { .withoutTag("tag1") .apply(); Assertions.assertTrue(resource.tags().containsKey("tag2")); - Assertions.assertTrue(!resource.tags().containsKey("tag1")); + Assertions.assertFalse(resource.tags().containsKey("tag1")); return resource; } @@ -202,7 +205,7 @@ public SearchService updateResource(SearchService resource) throws Exception { .withoutTag("tag1") .apply(); Assertions.assertTrue(resource.tags().containsKey("tag2")); - Assertions.assertTrue(!resource.tags().containsKey("tag1")); + Assertions.assertFalse(resource.tags().containsKey("tag1")); Assertions.assertEquals(SkuName.STANDARD, resource.sku().name()); Assertions.assertEquals(1, resource.replicaCount()); Assertions.assertEquals(1, resource.partitionCount()); @@ -247,7 +250,7 @@ public static void print(SearchService resource, String header) { stringBuilder.append("\n\t Key value: ").append(queryKey.key()); } - System.out.println(stringBuilder); + LOGGER.log(LogLevel.VERBOSE, stringBuilder::toString); } } diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestTemplate.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestTemplate.java index bb847d6b08d6..0f0035d66adc 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestTemplate.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestTemplate.java @@ -4,6 +4,8 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.core.management.exception.ManagementException; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.resourcemanager.resources.fluentcore.arm.Manager; import com.azure.resourcemanager.resources.fluentcore.arm.collection.SupportsGettingById; import com.azure.resourcemanager.resources.fluentcore.arm.collection.SupportsGettingByResourceGroup; @@ -23,12 +25,13 @@ * @param Top level resource type * @param Type representing the collection of the top level resources */ -public abstract class TestTemplate< - ResourceT extends GroupableResource, ?>, +public abstract class TestTemplate, ?>, CollectionT extends SupportsListing & SupportsGettingByResourceGroup & SupportsDeletingById & SupportsGettingById & HasManager> { + private static final ClientLogger LOGGER = new ClientLogger(TestTemplate.class); + private ResourceT resource; private CollectionT collection; private ResourceGroups resourceGroups; @@ -64,7 +67,7 @@ protected TestTemplate() { public int verifyListing() throws ManagementException, IOException { PagedIterable resources = this.collection.list(); for (ResourceT r : resources) { - System.out.println("resource id: " + r.id()); + LOGGER.log(LogLevel.VERBOSE, () -> "resource id: " + r.id()); } return TestUtilities.getSize(resources); } @@ -118,7 +121,7 @@ public void runTest(CollectionT collection, ResourceGroups resourceGroups) throw // Verify creation this.resource = createResource(collection); - System.out.println("\n------------\nAfter creation:\n"); + LOGGER.log(LogLevel.VERBOSE, () -> "\n------------\nAfter creation:\n"); print(this.resource); // Verify listing @@ -127,7 +130,7 @@ public void runTest(CollectionT collection, ResourceGroups resourceGroups) throw // Verify getting this.resource = verifyGetting(); Assertions.assertNotNull(this.resource); - System.out.println("\n------------\nRetrieved resource:\n"); + LOGGER.log(LogLevel.VERBOSE, () -> "\n------------\nRetrieved resource:\n"); print(this.resource); boolean failedUpdate = false; @@ -136,11 +139,11 @@ public void runTest(CollectionT collection, ResourceGroups resourceGroups) throw try { this.resource = updateResource(this.resource); Assertions.assertNotNull(this.resource); - System.out.println("\n------------\nUpdated resource:\n"); + LOGGER.log(LogLevel.VERBOSE, () -> "\n------------\nUpdated resource:\n"); message = "Print failed"; print(this.resource); } catch (Exception e) { - e.printStackTrace(); + LOGGER.log(LogLevel.VERBOSE, () -> "Update failed", e); failedUpdate = true; } @@ -150,7 +153,7 @@ public void runTest(CollectionT collection, ResourceGroups resourceGroups) throw message = "Delete failed"; verifyDeleting(); } catch (Exception e) { - e.printStackTrace(); + LOGGER.log(LogLevel.VERBOSE, () -> "Delete failed", e); failedDelete = true; } Assertions.assertFalse(failedUpdate, message); diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestTrafficManager.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestTrafficManager.java index f0d9816d8828..71dc35953141 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestTrafficManager.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestTrafficManager.java @@ -3,6 +3,8 @@ package com.azure.resourcemanager; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.resourcemanager.network.models.PublicIpAddress; import com.azure.resourcemanager.network.models.PublicIpAddresses; import com.azure.core.management.Region; @@ -19,6 +21,7 @@ /** Test of traffic manager management. */ public class TestTrafficManager extends TestTemplate { + private static final ClientLogger LOGGER = new ClientLogger(TestTrafficManager.class); private final PublicIpAddresses publicIpAddresses; @@ -405,6 +408,6 @@ public void print(TrafficManagerProfile profile) { .append(endpoint.routingWeight()); } } - System.out.println(info.toString()); + LOGGER.log(LogLevel.VERBOSE, info::toString); } } diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestUtils.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestUtils.java index 85091cc9ec6b..d9a0908fb063 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestUtils.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestUtils.java @@ -4,12 +4,16 @@ package com.azure.resourcemanager; import com.azure.core.util.Configuration; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.resourcemanager.compute.models.DataDisk; import com.azure.resourcemanager.compute.models.VirtualMachine; import com.azure.resourcemanager.resources.models.ManagementLock; /** Test utilities. */ public final class TestUtils { + private static final ClientLogger LOGGER = new ClientLogger(TestUtils.class); + private TestUtils() { } @@ -22,11 +26,11 @@ public static boolean isRecordMode() { } public static void print(ManagementLock lock) { - StringBuffer info = new StringBuffer(); + StringBuilder info = new StringBuilder(); info.append("\nLock ID: ").append(lock.id()) .append("\nLocked resource ID: ").append(lock.lockedResourceId()) .append("\nLevel: ").append(lock.level()); - System.out.println(info.toString()); + LOGGER.log(LogLevel.VERBOSE, info::toString); } /** @@ -120,26 +124,9 @@ public static void print(VirtualMachine resource) { networkProfile.append("\n\t\tId:").append(networkInterfaceId); } - System - .out - .println( - new StringBuilder() - .append("Virtual Machine: ") - .append(resource.id()) - .append("Name: ") - .append(resource.name()) - .append("\n\tResource group: ") - .append(resource.resourceGroupName()) - .append("\n\tRegion: ") - .append(resource.region()) - .append("\n\tTags: ") - .append(resource.tags()) - .append("\n\tHardwareProfile: ") - .append("\n\t\tSize: ") - .append(resource.size()) - .append(storageProfile) - .append(osProfile) - .append(networkProfile) - .toString()); + LOGGER.log(LogLevel.VERBOSE, () -> "Virtual Machine: " + resource.id() + "Name: " + resource.name() + + "\n\tResource group: " + resource.resourceGroupName() + "\n\tRegion: " + resource.region() + "\n\tTags: " + + resource.tags() + "\n\tHardwareProfile: " + "\n\t\tSize: " + resource.size() + storageProfile + osProfile + + networkProfile); } } diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestVirtualNetworkGateway.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestVirtualNetworkGateway.java index b2f9099c59d8..68448d74db77 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestVirtualNetworkGateway.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestVirtualNetworkGateway.java @@ -3,6 +3,8 @@ package com.azure.resourcemanager; import com.azure.core.http.rest.PagedIterable; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.resourcemanager.network.NetworkManager; import com.azure.resourcemanager.network.models.LocalNetworkGateway; import com.azure.resourcemanager.network.models.Network; @@ -27,6 +29,8 @@ /** Tests Virtual Network Gateway. */ public class TestVirtualNetworkGateway { + private static final ClientLogger LOGGER = new ClientLogger(TestVirtualNetworkGateway.class); + private String testId = ""; private Region region = Region.US_NORTH_CENTRAL; private String groupName; @@ -324,7 +328,7 @@ certificateName, new File(getClass().getClassLoader().getResource(certificateNam // contains credential in the profile string String profile = vngw1.generateVpnProfile(); - System.out.println(profile); + LOGGER.log(LogLevel.VERBOSE, () -> profile); return vngw1; } @@ -359,6 +363,6 @@ static void printVirtualNetworkGateway(VirtualNetworkGateway gateway) { .append(gateway.regionName()) .append("\n\tTags: ") .append(gateway.tags()); - System.out.println(info.toString()); + LOGGER.log(LogLevel.VERBOSE, info::toString); } } diff --git a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ProxySelectorTest.java b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ProxySelectorTest.java index 7047f8138369..1dff7bec6184 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ProxySelectorTest.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ProxySelectorTest.java @@ -7,6 +7,7 @@ import com.azure.core.amqp.AmqpTransportType; import com.azure.core.util.BinaryData; import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -25,6 +26,8 @@ import java.util.concurrent.TimeUnit; public class ProxySelectorTest extends IntegrationTestBase { + private static final ClientLogger LOGGER = new ClientLogger(ProxySelectorTest.class); + private static final int PROXY_PORT = 9002; private static final InetSocketAddress SIMPLE_PROXY_ADDRESS = new InetSocketAddress("localhost", PROXY_PORT); private ProxySelector defaultProxySelector; @@ -78,7 +81,7 @@ public void connectFailed(URI uri, SocketAddress sa, IOException ioe) { .expectErrorSatisfies(error -> { // The message can vary because it is returned from proton-j, so we don't want to compare against that. // This is a transient error from ExceptionUtil.java: line 67. - System.out.println("Error: " + error); + LOGGER.log(LogLevel.VERBOSE, () -> "Error", error); }) .verify(TIMEOUT); diff --git a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ReceiveLinkTest.java b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ReceiveLinkTest.java index 033b74509fed..98b6c3f71787 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ReceiveLinkTest.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ReceiveLinkTest.java @@ -4,6 +4,8 @@ import com.azure.core.amqp.AmqpEndpointState; import com.azure.core.amqp.implementation.AmqpReceiveLink; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import org.junit.jupiter.api.AfterEach; import org.mockito.Mockito; import reactor.core.publisher.Flux; @@ -21,6 +23,8 @@ import static org.mockito.Mockito.when; public class ReceiveLinkTest { + private static final ClientLogger LOGGER = new ClientLogger(ReceiveLinkTest.class); + private final AtomicInteger counter = new AtomicInteger(); private final AmqpReceiveLink[] allLinks = new AmqpReceiveLink[4]; @@ -47,7 +51,7 @@ public void verifyCreation() { when(link2.getLinkName()).thenReturn("link2-name"); when(link2.getEndpointStates()).thenAnswer(invocation -> { - System.out.println("link2-name endpoints"); + LOGGER.log(LogLevel.VERBOSE, () -> "link2-name endpoints"); return Flux.create(sink -> { sink.onRequest(r -> sink.next(AmqpEndpointState.UNINITIALIZED)); @@ -56,7 +60,7 @@ public void verifyCreation() { when(link3.getLinkName()).thenReturn("link3-name"); when(link3.getEndpointStates()).thenAnswer(invocation -> { - System.out.println("link3-name endpoints"); + LOGGER.log(LogLevel.VERBOSE, () -> "link3-name endpoints"); return Flux.create(sink -> { // Emit uninitialized first. After 3 seconds, emit ACTIVE. sink.onRequest(r -> { @@ -88,7 +92,7 @@ private Mono getActiveLink() { }) .retryWhen(Retry.from(retrySignals -> retrySignals.flatMap(signal -> { final Throwable failure = signal.failure(); - System.err.printf(" Retry: %s. Error occurred while waiting: %s%n", signal.totalRetriesInARow(), failure); + LOGGER.verbose(" Retry: {}. Error occurred while waiting: {}", signal.totalRetriesInARow(), failure); if (failure instanceof TimeoutException) { return Mono.delay(Duration.ofSeconds(4)); } else { @@ -100,7 +104,7 @@ private Mono getActiveLink() { private Mono createReceiveLink() { int index = counter.getAndIncrement(); - System.out.println("Index: " + index); + LOGGER.log(LogLevel.VERBOSE, () -> "Index: " + index); if (index < allLinks.length) { return Mono.just(allLinks[index]); } else { diff --git a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusMixClientIntegrationTest.java b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusMixClientIntegrationTest.java index 0b46e7fb5473..9709bc8f7726 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusMixClientIntegrationTest.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusMixClientIntegrationTest.java @@ -4,6 +4,7 @@ package com.azure.messaging.servicebus; import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.messaging.servicebus.implementation.MessagingEntityType; import com.azure.messaging.servicebus.models.CompleteOptions; import com.azure.messaging.servicebus.models.ServiceBusReceiveMode; @@ -28,6 +29,8 @@ * Test where various clients are involved for example Sender, Receiver and Processor client. */ public class ServiceBusMixClientIntegrationTest extends IntegrationTestBase { + private static final ClientLogger LOGGER = new ClientLogger(ServiceBusMixClientIntegrationTest.class); + private ServiceBusSenderAsyncClient sender; private ServiceBusReceiverAsyncClient receiver; private final AtomicInteger messagesPending = new AtomicInteger(); @@ -106,7 +109,7 @@ void crossEntityQueueTransaction(boolean isSessionEnabled) throws InterruptedExc receivedMessages.incrementAndGet(); messagesPending.incrementAndGet(); ServiceBusReceivedMessage myMessage = context.getMessage(); - System.out.printf("Processing message. MessageId: %s, Sequence #: %s. Contents: %s %n", myMessage.getMessageId(), + LOGGER.verbose("Processing message. MessageId: {}, Sequence #: {}. Contents: {}", myMessage.getMessageId(), myMessage.getSequenceNumber(), myMessage.getBody()); if (receivedMessages.get() == 1) { @@ -122,12 +125,12 @@ void crossEntityQueueTransaction(boolean isSessionEnabled) throws InterruptedExc }; Consumer processError = context -> { - System.out.printf("Error when receiving messages from namespace: '%s'. Entity: '%s'. Error Source: '%s' %n", + LOGGER.verbose("Error when receiving messages from namespace: '{}'. Entity: '{}'. Error Source: '{}'", context.getFullyQualifiedNamespace(), context.getEntityPath(), context.getErrorSource()); Assertions.fail("Failed processing of message.", context.getException()); if (!(context.getException() instanceof ServiceBusException)) { - System.out.printf("Non-ServiceBusException occurred: %s%n", context.getException()); + LOGGER.log(LogLevel.VERBOSE, () -> "Non-ServiceBusException occurred: " + context.getException()); } }; @@ -150,17 +153,17 @@ void crossEntityQueueTransaction(boolean isSessionEnabled) throws InterruptedExc // Create an instance of the processor through the ServiceBusClientBuilder // Act - System.out.println("Starting the processor"); + LOGGER.log(LogLevel.VERBOSE, () -> "Starting the processor"); processorA.start(); toClose((AutoCloseable) () -> processorA.stop()); // Assert - System.out.println("Listening for 10 seconds..."); + LOGGER.log(LogLevel.VERBOSE, () -> "Listening for 10 seconds..."); if (countdownLatch.await(10, TimeUnit.SECONDS)) { - System.out.println("Completed processing successfully."); + LOGGER.log(LogLevel.VERBOSE, () -> "Completed processing successfully."); Assertions.assertTrue(transactionComplete.get()); } else { - System.out.println("Closing processor."); + LOGGER.log(LogLevel.VERBOSE, () -> "Closing processor."); Assertions.fail("Failed to process message."); } @@ -216,7 +219,7 @@ void crossEntitySubscriptionTransaction(boolean isSessionEnabled) throws Interru receivedMessages.incrementAndGet(); messagesPending.incrementAndGet(); ServiceBusReceivedMessage myMessage = context.getMessage(); - System.out.printf("Processing message. MessageId: %s, Sequence #: %s. Contents: %s %n", myMessage.getMessageId(), + LOGGER.verbose("Processing message. MessageId: {}, Sequence #: {}. Contents: {}", myMessage.getMessageId(), myMessage.getSequenceNumber(), myMessage.getBody()); if (receivedMessages.get() == 1) { @@ -232,12 +235,12 @@ void crossEntitySubscriptionTransaction(boolean isSessionEnabled) throws Interru }; Consumer processError = context -> { - System.out.printf("Error when receiving messages from namespace: '%s'. Entity: '%s'. Error Source: '%s' %n", + LOGGER.verbose("Error when receiving messages from namespace: '{}'. Entity: '{}'. Error Source: '{}'", context.getFullyQualifiedNamespace(), context.getEntityPath(), context.getErrorSource()); Assertions.fail("Failed processing of message.", context.getException()); if (!(context.getException() instanceof ServiceBusException)) { - System.out.printf("Non-ServiceBusException occurred: %s%n", context.getException()); + LOGGER.log(LogLevel.VERBOSE, () -> "Non-ServiceBusException occurred: " + context.getException()); } }; @@ -268,17 +271,17 @@ void crossEntitySubscriptionTransaction(boolean isSessionEnabled) throws Interru // Create an instance of the processor through the ServiceBusClientBuilder // Act - System.out.println("Starting the processor"); + LOGGER.log(LogLevel.VERBOSE, () -> "Starting the processor"); processorA.start(); toClose((AutoCloseable) () -> processorA.stop()); // Assert - System.out.println("Listening for 10 seconds..."); + LOGGER.log(LogLevel.VERBOSE, () -> "Listening for 10 seconds..."); if (countdownLatch.await(10, TimeUnit.SECONDS)) { - System.out.println("Completed processing successfully."); + LOGGER.log(LogLevel.VERBOSE, () -> "Completed processing successfully."); Assertions.assertTrue(transactionComplete.get()); } else { - System.out.println("Closing processor."); + LOGGER.log(LogLevel.VERBOSE, () -> "Closing processor."); Assertions.fail("Failed to process message."); } @@ -361,12 +364,12 @@ void crossEntityQueueTransactionWithReceiverSenderTest(boolean isSessionEnabled) toClose(subscription); // Act - System.out.println("Listening for 10 seconds..."); + LOGGER.log(LogLevel.VERBOSE, () -> "Listening for 10 seconds..."); if (countdownLatch.await(10, TimeUnit.SECONDS)) { - System.out.println("Completed message processing successfully."); + LOGGER.log(LogLevel.VERBOSE, () -> "Completed message processing successfully."); Assertions.assertTrue(transactionComplete.get()); } else { - System.out.println("Some error."); + LOGGER.log(LogLevel.VERBOSE, () -> "Some error."); Assertions.fail("Failed to process message."); } @@ -447,12 +450,12 @@ void crossEntitySubscriptionTransactionWithReceiverSenderTest(boolean isSessionE }).subscribe(); toClose(subscription); // Act - System.out.println("Listening for 10 seconds..."); + LOGGER.log(LogLevel.VERBOSE, () -> "Listening for 10 seconds..."); if (countdownLatch.await(10, TimeUnit.SECONDS)) { - System.out.println("Completed message processing successfully."); + LOGGER.log(LogLevel.VERBOSE, () -> "Completed message processing successfully."); Assertions.assertTrue(transactionComplete.get()); } else { - System.out.println("Some error."); + LOGGER.log(LogLevel.VERBOSE, () -> "Some error."); Assertions.fail("Failed to process message."); } diff --git a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClientTest.java b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClientTest.java index 42052a460dc0..4686edf67643 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClientTest.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClientTest.java @@ -24,6 +24,7 @@ import com.azure.core.util.ClientOptions; import com.azure.core.util.Context; import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.core.util.tracing.StartSpanOptions; import com.azure.core.util.tracing.Tracer; import com.azure.messaging.servicebus.ServiceBusClientBuilder.ServiceBusReceiverClientBuilder; @@ -1317,13 +1318,14 @@ void autoCompleteMessage(boolean isV2) { try { // Act & Assert - StepVerifier.create(receiver2.receiveMessages().take(numberOfEvents).doOnComplete(() -> System.out.println("take complete.."))) + StepVerifier.create(receiver2.receiveMessages().take(numberOfEvents) + .doOnComplete(() -> LOGGER.log(LogLevel.VERBOSE, () -> "take complete.."))) .then(() -> messages.forEach(m -> messageSink.next(m))) .expectNextCount(numberOfEvents) .expectComplete() .verify(DEFAULT_TIMEOUT); } finally { - System.out.println("CLOSING...."); + LOGGER.log(LogLevel.VERBOSE, () -> "CLOSING...."); receiver2.close(); } diff --git a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusSenderAsyncClientIntegrationTest.java b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusSenderAsyncClientIntegrationTest.java index 2da9dc8d8788..d62e825e3a4d 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusSenderAsyncClientIntegrationTest.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusSenderAsyncClientIntegrationTest.java @@ -4,6 +4,7 @@ package com.azure.messaging.servicebus; import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.messaging.servicebus.implementation.MessagingEntityType; import com.azure.messaging.servicebus.models.CreateMessageBatchOptions; import com.azure.messaging.servicebus.models.ServiceBusReceiveMode; @@ -35,6 +36,8 @@ */ @Tag("integration") class ServiceBusSenderAsyncClientIntegrationTest extends IntegrationTestBase { + private static final ClientLogger LOGGER = new ClientLogger(ServiceBusSenderAsyncClientIntegrationTest.class); + private ServiceBusSenderAsyncClient sender; private ServiceBusReceiverAsyncClient receiver; private final AtomicInteger messagesPending = new AtomicInteger(); @@ -358,17 +361,17 @@ void transactionMessageSendAndCompleteTransaction(MessagingEntityType entityType .verify(TIMEOUT); StepVerifier.create(receiver.receiveMessages().take(total)) .assertNext(receivedMessage -> { - System.out.println("1"); + LOGGER.log(LogLevel.VERBOSE, () -> "1"); assertMessageEquals(receivedMessage, messageId, isSessionEnabled); messagesPending.decrementAndGet(); }) .assertNext(receivedMessage -> { - System.out.println("2"); + LOGGER.log(LogLevel.VERBOSE, () -> "2"); assertMessageEquals(receivedMessage, messageId, isSessionEnabled); messagesPending.decrementAndGet(); }) .assertNext(receivedMessage -> { - System.out.println("3"); + LOGGER.log(LogLevel.VERBOSE, () -> "3"); assertMessageEquals(receivedMessage, messageId, isSessionEnabled); messagesPending.decrementAndGet(); }) diff --git a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusSessionManagerTest.java b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusSessionManagerTest.java index 05804738519f..aa93866c66fd 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusSessionManagerTest.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusSessionManagerTest.java @@ -13,6 +13,7 @@ import com.azure.core.credential.TokenCredential; import com.azure.core.util.ClientOptions; import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.messaging.servicebus.implementation.MessagingEntityType; import com.azure.messaging.servicebus.implementation.ServiceBusAmqpConnection; import com.azure.messaging.servicebus.implementation.ServiceBusConnectionProcessor; @@ -382,23 +383,23 @@ void multipleSessions() { } }) .assertNext(context -> { - System.out.println("1"); + LOGGER.log(LogLevel.VERBOSE, () -> "1"); assertMessageEquals(sessionId, receivedMessage, context); }) .assertNext(context -> { - System.out.println("2"); + LOGGER.log(LogLevel.VERBOSE, () -> "2"); assertMessageEquals(sessionId, receivedMessage, context); }) .assertNext(context -> { - System.out.println("3"); + LOGGER.log(LogLevel.VERBOSE, () -> "3"); assertMessageEquals(sessionId, receivedMessage, context); }) .assertNext(context -> { - System.out.println("4"); + LOGGER.log(LogLevel.VERBOSE, () -> "4"); assertMessageEquals(sessionId, receivedMessage, context); }) .assertNext(context -> { - System.out.println("5"); + LOGGER.log(LogLevel.VERBOSE, () -> "5"); assertMessageEquals(sessionId, receivedMessage, context); }) .thenAwait(Duration.ofSeconds(13)) @@ -408,15 +409,15 @@ void multipleSessions() { } }) .assertNext(context -> { - System.out.println("6"); + LOGGER.log(LogLevel.VERBOSE, () -> "6"); assertMessageEquals(sessionId2, receivedMessage2, context); }) .assertNext(context -> { - System.out.println("7"); + LOGGER.log(LogLevel.VERBOSE, () -> "7"); assertMessageEquals(sessionId2, receivedMessage2, context); }) .assertNext(context -> { - System.out.println("8"); + LOGGER.log(LogLevel.VERBOSE, () -> "8"); assertMessageEquals(sessionId2, receivedMessage2, context); }) .thenAwait(Duration.ofSeconds(15)) diff --git a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/TestUtils.java b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/TestUtils.java index 6416b0409ef5..8531bdedeb7a 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/TestUtils.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/TestUtils.java @@ -8,6 +8,8 @@ import com.azure.core.util.BinaryData; import com.azure.core.util.Configuration; import com.azure.core.util.CoreUtils; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.messaging.servicebus.administration.models.AccessRights; import com.azure.messaging.servicebus.administration.models.AuthorizationRule; import org.apache.qpid.proton.Proton; @@ -46,6 +48,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; public class TestUtils { + private static final ClientLogger LOGGER = new ClientLogger(TestUtils.class); // System and application properties from the generated test message. static final Instant ENQUEUED_TIME = Instant.ofEpochSecond(1561344661); @@ -145,7 +148,7 @@ public static String getConnectionString(boolean withSas) { } return String.format(connectionStringWithSasAndEntityFormat, endpoint, signatureValue, entityPath); } catch (Exception e) { - e.printStackTrace(); + LOGGER.log(LogLevel.VERBOSE, () -> "Error while getting connection string", e); } } return connectionString; diff --git a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/implementation/ServiceBusReceiveLinkProcessorTest.java b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/implementation/ServiceBusReceiveLinkProcessorTest.java index 3f108c6b6678..66720fb5fd24 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/implementation/ServiceBusReceiveLinkProcessorTest.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/implementation/ServiceBusReceiveLinkProcessorTest.java @@ -7,6 +7,8 @@ import com.azure.core.amqp.exception.AmqpErrorCondition; import com.azure.core.amqp.exception.AmqpErrorContext; import com.azure.core.amqp.exception.AmqpException; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import org.apache.qpid.proton.amqp.transport.DeliveryState; import org.apache.qpid.proton.message.Message; import org.junit.jupiter.api.AfterEach; @@ -36,6 +38,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertSame; @@ -55,6 +58,8 @@ * Tests for {@link ServiceBusReceiveLinkProcessor}. */ class ServiceBusReceiveLinkProcessorTest { + private static final ClientLogger LOGGER = new ClientLogger(ServiceBusReceiveLinkProcessorTest.class); + private static final int PREFETCH = 5; @Mock private ServiceBusReceiveLink link1; @@ -172,9 +177,9 @@ void respectsBackpressureLessThanMinimum() throws InterruptedException { // Act semaphore.acquire(); processor.subscribe( - e -> System.out.println("message: " + e), + e -> LOGGER.log(LogLevel.VERBOSE, () -> "message: " + e), Assertions::fail, - () -> System.out.println("Complete."), + () -> LOGGER.log(LogLevel.VERBOSE, () -> "Complete."), s -> { s.request(backpressure); semaphore.release(); @@ -262,9 +267,7 @@ void newLinkOnClose() { }) .expectNext(message3) .expectNext(message4) - .then(() -> { - processor.cancel(); - }) + .then(processor::cancel) .verifyComplete(); assertTrue(processor.isTerminated()); @@ -336,12 +339,12 @@ void nonRetryableError() { // Verify that we get the first connection. StepVerifier.create(processor) .then(() -> { - System.out.println("Outputting exception."); + LOGGER.log(LogLevel.VERBOSE, () -> "Outputting exception."); endpointProcessor.error(amqpException); }) .expectErrorSatisfies(error -> { - System.out.println("Asserting exception."); - assertTrue(error instanceof AmqpException); + LOGGER.log(LogLevel.VERBOSE, () -> "Asserting exception."); + assertInstanceOf(AmqpException.class, error); AmqpException exception = (AmqpException) error; assertFalse(exception.isTransient()); diff --git a/sdk/spring/spring-cloud-azure-appconfiguration-config/src/test/java/com/azure/spring/cloud/appconfiguration/config/implementation/TestUtils.java b/sdk/spring/spring-cloud-azure-appconfiguration-config/src/test/java/com/azure/spring/cloud/appconfiguration/config/implementation/TestUtils.java index 1a09cdf8ed1a..e9fe610f0e4c 100644 --- a/sdk/spring/spring-cloud-azure-appconfiguration-config/src/test/java/com/azure/spring/cloud/appconfiguration/config/implementation/TestUtils.java +++ b/sdk/spring/spring-cloud-azure-appconfiguration-config/src/test/java/com/azure/spring/cloud/appconfiguration/config/implementation/TestUtils.java @@ -7,6 +7,8 @@ import java.util.Map; import java.util.Set; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.data.appconfiguration.models.ConfigurationSetting; import com.azure.data.appconfiguration.models.FeatureFlagConfigurationSetting; import com.azure.data.appconfiguration.models.FeatureFlagFilter; @@ -23,6 +25,7 @@ * Utility methods which can be used across different test classes */ public final class TestUtils { + private static final ClientLogger LOGGER = new ClientLogger(TestUtils.class); private static final ObjectMapper MAPPER = new ObjectMapper(); @@ -75,7 +78,7 @@ static FeatureFlagConfigurationSetting createItemFeatureFlag(String prefix, Stri item.addClientFilter(filter); } } catch (JsonProcessingException e) { - e.printStackTrace(); + LOGGER.log(LogLevel.VERBOSE, () -> "Failed to create FeatureFlagConfigurationSetting.", e); } return item; } diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/TestJwks.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/TestJwks.java index 5dca4d976bd8..99546b479151 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/TestJwks.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/TestJwks.java @@ -3,6 +3,8 @@ package com.azure.spring.cloud.autoconfigure.aad.implementation; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.nimbusds.jose.jwk.RSAKey; import com.nimbusds.jose.util.Base64URL; @@ -14,6 +16,7 @@ import java.security.interfaces.RSAPublicKey; public final class TestJwks { + private static final ClientLogger LOGGER = new ClientLogger(TestJwks.class); // @formatter:off public static final RSAKey DEFAULT_RSA_JWK = @@ -38,7 +41,7 @@ public static RSAKey.Builder jwk(RSAPublicKey publicKey, RSAPrivateKey privateKe .x509CertThumbprint(Base64URL.encode(bytes)) .keyID("rsa-jwk-kid"); } catch (CertificateEncodingException | NoSuchAlgorithmException e) { - e.printStackTrace(); + LOGGER.log(LogLevel.VERBOSE, () -> "Failed to generate thumbprint for certificate.", e); } return null; // @formatter:on diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/graph/UserPrincipalMicrosoftGraphTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/graph/UserPrincipalMicrosoftGraphTests.java index d49e86657011..98024e7579db 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/graph/UserPrincipalMicrosoftGraphTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/graph/UserPrincipalMicrosoftGraphTests.java @@ -3,6 +3,8 @@ package com.azure.spring.cloud.autoconfigure.aad.implementation.graph; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.spring.cloud.autoconfigure.aad.filter.UserPrincipal; import com.azure.spring.cloud.autoconfigure.aad.properties.AadAuthenticationProperties; import com.azure.spring.cloud.autoconfigure.aad.properties.AadAuthorizationServerEndpoints; @@ -49,6 +51,7 @@ @TestInstance(TestInstance.Lifecycle.PER_CLASS) class UserPrincipalMicrosoftGraphTests { + private static final ClientLogger LOGGER = new ClientLogger(UserPrincipalMicrosoftGraphTests.class); private static final String MOCK_MICROSOFT_GRAPH_ENDPOINT = "http://localhost:8080/"; @@ -68,7 +71,7 @@ class UserPrincipalMicrosoftGraphTests { }); userGroupsJson = objectMapper.writeValueAsString(json); } catch (IOException e) { - e.printStackTrace(); + LOGGER.log(LogLevel.VERBOSE, () -> "Failed to load user groups json.", e); userGroupsJson = null; } assertNotNull(userGroupsJson); diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/graph/ThreadInterruptedStatusRestoreTest.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/graph/ThreadInterruptedStatusRestoreTest.java index bd8b448ca437..8ea467b01370 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/graph/ThreadInterruptedStatusRestoreTest.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/graph/ThreadInterruptedStatusRestoreTest.java @@ -3,6 +3,8 @@ package com.azure.spring.cloud.autoconfigure.implementation.graph; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -10,6 +12,7 @@ import java.util.concurrent.TimeUnit; public class ThreadInterruptedStatusRestoreTest { + private static final ClientLogger LOGGER = new ClientLogger(ThreadInterruptedStatusRestoreTest.class); @Test void testThreadInterruptedRestoreFromAnotherThread() throws InterruptedException { @@ -22,9 +25,9 @@ void testThreadInterruptedRestoreFromAnotherThread() throws InterruptedException testThread.interrupt(); latchForInCatch.await(); - System.out.println(Thread.currentThread().getName() + ": begin assertion"); + LOGGER.log(LogLevel.VERBOSE, () -> Thread.currentThread().getName() + ": begin assertion"); Assertions.assertTrue((testThread).getIsInterrupted()); - System.out.println(Thread.currentThread().getName() + ": end assertion"); + LOGGER.log(LogLevel.VERBOSE, () -> Thread.currentThread().getName() + ": end assertion"); } @Test @@ -38,9 +41,9 @@ void testThreadInterruptedNotRestoreFromAnotherThread() throws InterruptedExcept testThread.interrupt(); latchForInCatch.await(); - System.out.println(Thread.currentThread().getName() + ": begin assertion"); + LOGGER.log(LogLevel.VERBOSE, () -> Thread.currentThread().getName() + ": begin assertion"); Assertions.assertFalse(testThread.getIsInterrupted()); - System.out.println(Thread.currentThread().getName() + ": end assertion"); + LOGGER.log(LogLevel.VERBOSE, () -> Thread.currentThread().getName() + ": end assertion"); } @@ -64,7 +67,8 @@ public void run() { latchForInWhile.countDown(); TimeUnit.SECONDS.sleep(3); } catch (InterruptedException ex) { - System.out.println(Thread.currentThread().getName() + ": current thread was interrupted!"); + LOGGER.log(LogLevel.VERBOSE, + () -> Thread.currentThread().getName() + ": current thread was interrupted!"); if (restore) { Thread.currentThread().interrupt(); } diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/jms/AzureServiceBusJmsPropertiesTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/jms/AzureServiceBusJmsPropertiesTests.java index e198123d55a9..fff6275c6c85 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/jms/AzureServiceBusJmsPropertiesTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/jms/AzureServiceBusJmsPropertiesTests.java @@ -3,6 +3,8 @@ package com.azure.spring.cloud.autoconfigure.jms; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.spring.cloud.autoconfigure.jms.properties.AzureServiceBusJmsProperties; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -17,6 +19,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; class AzureServiceBusJmsPropertiesTests { + private static final ClientLogger LOGGER = new ClientLogger(AzureServiceBusJmsPropertiesTests.class); + static final String CONNECTION_STRING = "Endpoint=sb://host/;SharedAccessKeyName=sasKeyName;" + "SharedAccessKey=sasKey"; @@ -31,7 +35,7 @@ void connectionStringNotValid() { String expectedMessage = "'spring.jms.servicebus.connection-string' should be provided."; String actualMessage = ex.getMessage(); - System.out.println("message:" + actualMessage); + LOGGER.log(LogLevel.VERBOSE, () -> "message:" + actualMessage); assertTrue(actualMessage.contains(expectedMessage)); } @@ -47,7 +51,7 @@ void pricingTierNotValid(String pricingTier) { String expectedMessage = "'spring.jms.servicebus.pricing-tier' is not valid"; String actualMessage = ex.getMessage(); - System.out.println("message:" + actualMessage); + LOGGER.log(LogLevel.VERBOSE, () -> "message:" + actualMessage); assertTrue(actualMessage.contains(expectedMessage)); } diff --git a/sdk/spring/spring-messaging-azure-eventhubs/src/test/java/com/azure/spring/messaging/eventhubs/core/EventHubsTemplateTests.java b/sdk/spring/spring-messaging-azure-eventhubs/src/test/java/com/azure/spring/messaging/eventhubs/core/EventHubsTemplateTests.java index 7e931c350b6e..0a6109aa71db 100644 --- a/sdk/spring/spring-messaging-azure-eventhubs/src/test/java/com/azure/spring/messaging/eventhubs/core/EventHubsTemplateTests.java +++ b/sdk/spring/spring-messaging-azure-eventhubs/src/test/java/com/azure/spring/messaging/eventhubs/core/EventHubsTemplateTests.java @@ -5,6 +5,8 @@ import com.azure.core.amqp.exception.AmqpErrorCondition; import com.azure.core.amqp.exception.AmqpException; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.messaging.eventhubs.EventData; import com.azure.messaging.eventhubs.EventDataBatch; import com.azure.messaging.eventhubs.EventHubProducerAsyncClient; @@ -31,6 +33,7 @@ class EventHubsTemplateTests { + private static final ClientLogger LOGGER = new ClientLogger(EventHubsTemplateTests.class); private EventHubProducerAsyncClient mockProducerClient; protected String destination = "event-hub"; @@ -93,9 +96,8 @@ void testSendAsyncForMessagesOneBatchAndSendCompletely() { List> messages = messagesList.stream().map((Function>) GenericMessage::new).collect(Collectors.toList()); - Mono mono = this.eventHubsTemplate.sendAsync(this.destination, messages, null).doOnSuccess(t -> { - System.out.println("do on success:" + t); - }); + Mono mono = this.eventHubsTemplate.sendAsync(this.destination, messages, null) + .doOnSuccess(t -> LOGGER.log(LogLevel.VERBOSE, () -> "do on success:" + t)); StepVerifier.create(mono) .verifyComplete(); @@ -125,12 +127,9 @@ void testSendAsyncForMessagesOneBatchAndSendCompletelyWithException() { List> messages = messagesList.stream().map((Function>) GenericMessage::new).collect(Collectors.toList()); - Mono mono = this.eventHubsTemplate.sendAsync(this.destination, messages, null).doOnError(ex -> { - System.out.println("do on Error"); - ex.printStackTrace(); - }).doOnSuccess(t -> { - System.out.println("do on success:" + t); - }); + Mono mono = this.eventHubsTemplate.sendAsync(this.destination, messages, null) + .doOnError(ex -> LOGGER.log(LogLevel.VERBOSE, () -> "do on Error", ex)) + .doOnSuccess(t -> LOGGER.log(LogLevel.VERBOSE, () -> "do on success:" + t)); StepVerifier.create(mono) .verifyComplete(); verify(this.mockProducerClient, times(1)).send(any(EventDataBatch.class)); @@ -160,12 +159,9 @@ void testSendAsyncForMessagesTwoBatchAndSendCompletelyWithException() { List> messages = messagesList.stream().map((Function>) GenericMessage::new).collect(Collectors.toList()); - Mono mono = this.eventHubsTemplate.sendAsync(this.destination, messages, null).doOnError(ex -> { - System.out.println("do on Error"); - ex.printStackTrace(); - }).doOnSuccess(t -> { - System.out.println("do on success:" + t); - }); + Mono mono = this.eventHubsTemplate.sendAsync(this.destination, messages, null) + .doOnError(ex -> LOGGER.log(LogLevel.VERBOSE, () -> "do on Error", ex)) + .doOnSuccess(t -> LOGGER.log(LogLevel.VERBOSE, () -> "do on success:" + t)); StepVerifier.create(mono) .verifyComplete(); verify(this.mockProducerClient, times(2)).send(any(EventDataBatch.class)); @@ -189,12 +185,9 @@ void testSendAsyncForMessagesWithTheSecondEventTooLargeForOneNewBatch() { List> messages = messagesList.stream().map((Function>) GenericMessage::new).collect(Collectors.toList()); - Mono mono = this.eventHubsTemplate.sendAsync(this.destination, messages, null).doOnError(ex -> { - System.out.println("do on Error" + ex.getMessage()); - ex.printStackTrace(); - }).doOnSuccess(t -> { - System.out.println("do on success:" + t); - }); + Mono mono = this.eventHubsTemplate.sendAsync(this.destination, messages, null) + .doOnError(ex -> LOGGER.log(LogLevel.VERBOSE, () -> "do on Error", ex)) + .doOnSuccess(t -> LOGGER.log(LogLevel.VERBOSE, () -> "do on success:" + t)); StepVerifier.create(mono) .verifyComplete(); verify(this.mockProducerClient, times(2)).send(any(EventDataBatch.class)); diff --git a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/RequestRetryTestFactory.java b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/RequestRetryTestFactory.java index 0a3e792ec5fb..7fed3d1953bb 100644 --- a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/RequestRetryTestFactory.java +++ b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/RequestRetryTestFactory.java @@ -13,6 +13,8 @@ import com.azure.core.util.BinaryData; import com.azure.core.util.Context; import com.azure.core.util.UrlBuilder; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.storage.common.policy.RequestRetryOptions; import com.azure.storage.common.policy.RequestRetryPolicy; import reactor.core.Disposable; @@ -33,6 +35,8 @@ import static java.lang.StrictMath.pow; class RequestRetryTestFactory { + private static final ClientLogger LOGGER = new ClientLogger(RequestRetryTestFactory.class); + static final int RETRY_TEST_SCENARIO_RETRY_UNTIL_SUCCESS = 1; static final int RETRY_TEST_SCENARIO_RETRY_UNTIL_MAX_RETRIES = 2; @@ -219,7 +223,8 @@ public Mono send(HttpRequest request) { } }); while (!disposable.isDisposed()) { - System.out.println("Waiting for Flux to finish to prevent blocking on another thread exception"); + LOGGER.log(LogLevel.VERBOSE, + () -> "Waiting for Flux to finish to prevent blocking on another thread exception"); } if (retryTestDefaultData.compareTo(ByteBuffer.wrap(outputStream.toByteArray())) != 0) { throw new IllegalArgumentException(("Body not reset.")); diff --git a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/RetryTests.java b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/RetryTests.java index e0542697dd50..275488bc0ec6 100644 --- a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/RetryTests.java +++ b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/RetryTests.java @@ -5,6 +5,7 @@ import com.azure.core.exception.UnexpectedLengthException; import com.azure.core.http.HttpResponse; +import com.azure.core.util.logging.LogLevel; import com.azure.storage.common.policy.RequestRetryOptions; import com.azure.storage.common.policy.RetryPolicyType; import org.junit.jupiter.api.Test; @@ -32,7 +33,7 @@ public class RetryTests extends BlobTestBase { try { retryTestURL = new URL("https://" + RequestRetryTestFactory.RETRY_TEST_PRIMARY_HOST); } catch (MalformedURLException e) { - e.printStackTrace(); + LOGGER.log(LogLevel.VERBOSE, () -> "Failed to create URL for retry tests.", e); } } diff --git a/sdk/storage/azure-storage-file-share/src/test/java/com/azure/storage/file/share/DirectoryApiTests.java b/sdk/storage/azure-storage-file-share/src/test/java/com/azure/storage/file/share/DirectoryApiTests.java index 4a9a58e0cd8b..3c795ad37af9 100644 --- a/sdk/storage/azure-storage-file-share/src/test/java/com/azure/storage/file/share/DirectoryApiTests.java +++ b/sdk/storage/azure-storage-file-share/src/test/java/com/azure/storage/file/share/DirectoryApiTests.java @@ -1647,11 +1647,7 @@ public void createShareWithSmallTimeoutsFailForServiceClient() { return; } catch (Exception e) { // Test failed; wait before retrying - try { - Thread.sleep(retryDelayMillis); - } catch (InterruptedException ex) { - Thread.currentThread().interrupt(); - } + sleepIfRunningAgainstService(retryDelayMillis); } } } diff --git a/sdk/vision/azure-ai-vision-imageanalysis/src/test/java/com/azure/ai/vision/imageanalysis/ImageAnalysisClientTestBase.java b/sdk/vision/azure-ai-vision-imageanalysis/src/test/java/com/azure/ai/vision/imageanalysis/ImageAnalysisClientTestBase.java index 12484368612e..c9179536e7f5 100644 --- a/sdk/vision/azure-ai-vision-imageanalysis/src/test/java/com/azure/ai/vision/imageanalysis/ImageAnalysisClientTestBase.java +++ b/sdk/vision/azure-ai-vision-imageanalysis/src/test/java/com/azure/ai/vision/imageanalysis/ImageAnalysisClientTestBase.java @@ -6,9 +6,11 @@ import java.io.File; import java.util.List; import java.util.Map.Entry; +import java.util.Objects; import com.azure.core.credential.KeyCredential; import com.azure.core.exception.HttpResponseException; +import com.azure.core.http.HttpHeaderName; import com.azure.core.http.HttpRequest; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; @@ -26,11 +28,15 @@ import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import com.azure.ai.vision.imageanalysis.*; import com.azure.ai.vision.imageanalysis.models.*; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; class ImageAnalysisClientTestBase extends TestProxyTestBase { + private static final ClientLogger LOGGER = new ClientLogger(ImageAnalysisClientTestBase.class); final Boolean printResults = false; // Set to true to print results to console window @@ -64,8 +70,8 @@ private void createClient(String endpointEnvVar, String keyEnvVar, Boolean sync, endpoint = "https://fake-resource-name.cognitiveservices.azure.com"; } - String key = Configuration.getGlobalConfiguration().get(keyEnvVar); // Read real key from environment variable - if (key == null || keyEnvVar == "VISION_KEY_FAKE") { + String key = Configuration.getGlobalConfiguration().get(keyEnvVar); // Read real key from environment variable + if (key == null || Objects.equals(keyEnvVar, "VISION_KEY_FAKE")) { key = "00000000000000000000000000000000"; } @@ -105,7 +111,7 @@ protected void doAnalysis( ImageAnalysisOptions imageAnalysisOptions, // can be null RequestOptions requestOptions) { // can be null - Boolean fromUrl = imageSource.startsWith("http"); + boolean fromUrl = imageSource.startsWith("http"); Boolean genderNeutralCaption = null; List aspectRatios = null; @@ -209,7 +215,7 @@ protected void doAnalysisWithError( int expectedStatusCode, String expectedMessageContains) { - Boolean fromUrl = imageSource.startsWith("http"); + boolean fromUrl = imageSource.startsWith("http"); ImageAnalysisResult result = null; if (sync) { @@ -226,7 +232,7 @@ protected void doAnalysisWithError( options); } } catch (HttpResponseException e) { - System.out.println("Expected exception: " + e.getMessage()); + LOGGER.log(LogLevel.VERBOSE, () -> "Expected exception: " + e.getMessage()); assertEquals(expectedStatusCode, e.getResponse().getStatusCode()); assertTrue(e.getMessage().contains(expectedMessageContains)); return; @@ -245,15 +251,15 @@ protected void doAnalysisWithError( options).block(); } } catch (HttpResponseException e) { - System.out.println("Expected exception: " + e.getMessage()); + LOGGER.log(LogLevel.VERBOSE, () -> "Expected exception: " + e.getMessage()); assertEquals(expectedStatusCode, e.getResponse().getStatusCode()); assertTrue(e.getMessage().contains(expectedMessageContains)); return; } } - System.out.println("Test should have thrown an exception, but it did not"); - assertTrue(false); + LOGGER.log(LogLevel.VERBOSE, () -> "Test should have thrown an exception, but it did not"); + fail(); } private static void validateAnalysisResult( @@ -372,7 +378,7 @@ private static void validateDenseCaptions(ImageAnalysisResult result) { // Do not include the check below. It's okay to have two identical dense captions since they have different bounding boxes. // assertFalse(otherDenseCaption.getText().equals(denseCaption.getText())); assertFalse( - otherDenseCaption.getBoundingBox().getX() == denseCaption.getBoundingBox().getX() + otherDenseCaption.getBoundingBox().getX() == denseCaption.getBoundingBox().getX() && otherDenseCaption.getBoundingBox().getY() == denseCaption.getBoundingBox().getY() && otherDenseCaption.getBoundingBox().getHeight() == denseCaption.getBoundingBox().getHeight() && otherDenseCaption.getBoundingBox().getWidth() == denseCaption.getBoundingBox().getWidth()); @@ -389,7 +395,7 @@ private static void validateObjects(ObjectsResult objectsResult) { assertNotNull(objectsResult); assertTrue(objectsResult.getValues().size() > 1); - Boolean found1 = false; + boolean found1 = false; for (DetectedObject object : objectsResult.getValues()) { assertNotNull(object); assertNotNull(object.getTags()); @@ -401,7 +407,7 @@ private static void validateObjects(ObjectsResult objectsResult) { assertTrue(tag.getConfidence() > 0.0); assertTrue(tag.getConfidence() < 1.0); // We expect to see this in the list of objects - if (tag.getName().toLowerCase().equals("person")) { + if (tag.getName().equalsIgnoreCase("person")) { found1 = true; } } @@ -431,17 +437,17 @@ private static void validateTags(TagsResult tagsResult) { assertNotNull(tagsResult.getValues()); assertTrue(tagsResult.getValues().size() > 1); - Boolean found1 = false, found2 = false; + boolean found1 = false, found2 = false; for (DetectedTag tag : tagsResult.getValues()) { assertNotNull(tag.getName()); assertFalse(tag.getName().isEmpty()); assertTrue(tag.getConfidence() > 0.0); assertTrue(tag.getConfidence() < 1.0); // We expect to see both of these in the list of tags - if (tag.getName().toLowerCase().equals("person")) { + if (tag.getName().equalsIgnoreCase("person")) { found1 = true; } - if (tag.getName().toLowerCase().equals("laptop")) { + if (tag.getName().equalsIgnoreCase("laptop")) { found2 = true; } } @@ -458,7 +464,7 @@ private static void validateTags(TagsResult tagsResult) { private static void validatePeople(ImageAnalysisResult result) { assertNotNull(result.getPeople()); - assertTrue(result.getPeople().getValues().size() > 0); + assertFalse(result.getPeople().getValues().isEmpty()); for (DetectedPerson person : result.getPeople().getValues()) { assertTrue(person.getConfidence() > 0.0); @@ -487,13 +493,13 @@ private static void validateSmartCrops(ImageAnalysisResult result, List assertNotNull(result.getSmartCrops()); List listCropRegions = result.getSmartCrops().getValues(); if (aspectRatios == null) { - assertTrue(listCropRegions.size() == 1); + assertEquals(1, listCropRegions.size()); assertTrue(listCropRegions.get(0).getAspectRatio() >= 0.5); assertTrue(listCropRegions.get(0).getAspectRatio() <= 2.0); } else { - assertTrue(listCropRegions.size() == aspectRatios.size()); + assertEquals(listCropRegions.size(), aspectRatios.size()); for (int i = 0; i < listCropRegions.size(); i++) { - assertTrue(listCropRegions.get(i).getAspectRatio() == aspectRatios.get(i)); + assertEquals(listCropRegions.get(i).getAspectRatio(), aspectRatios.get(i)); assertTrue(listCropRegions.get(0).getAspectRatio() >= 0.75); assertTrue(listCropRegions.get(0).getAspectRatio() <= 1.8); } @@ -537,20 +543,20 @@ private static void validateRead(ImageAnalysisResult result) { // Do some validations on the first line DetectedTextLine line = lines.get(0); assertNotNull(line); - assertTrue(line.getText().equals("Sample text")); + assertEquals("Sample text", line.getText()); List polygon = line.getBoundingPolygon(); assertNotNull(polygon); assertEquals(4, polygon.size()); - for (int i = 0; i < polygon.size(); i++) { - assertTrue(polygon.get(i).getX() > 0); - assertTrue(polygon.get(i).getY() > 0); + for (ImagePoint imagePoint : polygon) { + assertTrue(imagePoint.getX() > 0); + assertTrue(imagePoint.getY() > 0); } // Do some verifications on the 3rd line line = lines.get(2); assertNotNull(line); - assertTrue(line.getText().equals("123 456")); + assertEquals("123 456", line.getText()); List words = line.getWords(); assertNotNull(words); @@ -558,111 +564,111 @@ private static void validateRead(ImageAnalysisResult result) { DetectedTextWord word = words.get(1); assertNotNull(word); - assertTrue(word.getText().equals("456")); + assertEquals("456", word.getText()); assertTrue(word.getConfidence() > 0.0); assertTrue(word.getConfidence() < 1.0); polygon = word.getBoundingPolygon(); assertNotNull(polygon); assertEquals(4, polygon.size()); - for (int i = 0; i < polygon.size(); i++) { - assertTrue(polygon.get(i).getX() > 0); - assertTrue(polygon.get(i).getY() > 0); + for (ImagePoint imagePoint : polygon) { + assertTrue(imagePoint.getX() > 0); + assertTrue(imagePoint.getY() > 0); } } private static void printHttpRequestAndResponse(Response response) { // Print HTTP request details to console HttpRequest request = response.getRequest(); - System.out.println(" HTTP request method: " + request.getHttpMethod()); - System.out.println(" HTTP request URL: " + request.getUrl()); - System.out.println(" HTTP request headers: "); + LOGGER.log(LogLevel.VERBOSE, () -> " HTTP request method: " + request.getHttpMethod()); + LOGGER.log(LogLevel.VERBOSE, () -> " HTTP request URL: " + request.getUrl()); + LOGGER.log(LogLevel.VERBOSE, () -> " HTTP request headers: "); request.getHeaders().forEach(header -> { - System.out.println(" " + header.getName() + ": " + header.getValue()); + LOGGER.log(LogLevel.VERBOSE, () -> " " + header.getName() + ": " + header.getValue()); }); - if (request.getHeaders().getValue("content-type").contains("application/json")) { - System.out.println(" HTTP request body: " + request.getBodyAsBinaryData().toString()); + if (request.getHeaders().getValue(HttpHeaderName.CONTENT_TYPE).contains("application/json")) { + LOGGER.log(LogLevel.VERBOSE, () -> " HTTP request body: " + request.getBodyAsBinaryData().toString()); } // Print HTTP response details to console - System.out.println(" HTTP response status code: " + response.getStatusCode()); - System.out.println(" HTTP response headers: "); + LOGGER.log(LogLevel.VERBOSE, () -> " HTTP response status code: " + response.getStatusCode()); + LOGGER.log(LogLevel.VERBOSE, () -> " HTTP response headers: "); response.getHeaders().forEach(header -> { - System.out.println(" " + header.getName() + ": " + header.getValue()); + LOGGER.log(LogLevel.VERBOSE, () -> " " + header.getName() + ": " + header.getValue()); }); } private static void printAnalysisResults(String testName, ImageAnalysisResult result) { - System.out.println(" ******************** TEST NAME: " + testName + " ******************** "); + LOGGER.log(LogLevel.VERBOSE, () -> " ******************** TEST NAME: " + testName + " ******************** "); try { - System.out.println(" Image height: " + result.getMetadata().getHeight()); - System.out.println(" Image width: " + result.getMetadata().getWidth()); - System.out.println(" Model version: " + result.getModelVersion()); + LOGGER.log(LogLevel.VERBOSE, () -> " Image height: " + result.getMetadata().getHeight()); + LOGGER.log(LogLevel.VERBOSE, () -> " Image width: " + result.getMetadata().getWidth()); + LOGGER.log(LogLevel.VERBOSE, () -> " Model version: " + result.getModelVersion()); if (result.getCaption() != null) { - System.out.println(" Caption:"); - System.out.println(" \"" + result.getCaption().getText() + "\", Confidence " + LOGGER.log(LogLevel.VERBOSE, () -> " Caption:"); + LOGGER.log(LogLevel.VERBOSE, () -> " \"" + result.getCaption().getText() + "\", Confidence " + String.format("%.4f", result.getCaption().getConfidence())); } if (result.getDenseCaptions() != null) { - System.out.println(" Dense Captions:"); + LOGGER.log(LogLevel.VERBOSE, () -> " Dense Captions:"); for (DenseCaption denseCaption : result.getDenseCaptions().getValues()) { - System.out.println(" \"" + denseCaption.getText() + "\", Bounding box " + LOGGER.log(LogLevel.VERBOSE, () -> " \"" + denseCaption.getText() + "\", Bounding box " + denseCaption.getBoundingBox() + ", Confidence " + String.format("%.4f", denseCaption.getConfidence())); } } if (result.getObjects() != null) { - System.out.println(" Objects:"); + LOGGER.log(LogLevel.VERBOSE, () -> " Objects:"); for (DetectedObject detectedObject : result.getObjects().getValues()) { - System.out.println(" \"" + detectedObject.getTags().get(0).getName() + "\", Bounding box " + LOGGER.log(LogLevel.VERBOSE, () -> " \"" + detectedObject.getTags().get(0).getName() + "\", Bounding box " + detectedObject.getBoundingBox() + ", Confidence " + String.format("%.4f", detectedObject.getTags().get(0).getConfidence())); } } if (result.getTags() != null) { - System.out.println(" Tags:"); + LOGGER.log(LogLevel.VERBOSE, () -> " Tags:"); for (DetectedTag tag : result.getTags().getValues()) { - System.out.println(" \"" + tag.getName() + "\", Confidence " + LOGGER.log(LogLevel.VERBOSE, () -> " \"" + tag.getName() + "\", Confidence " + String.format("%.4f", tag.getConfidence())); } } if (result.getPeople() != null) { - System.out.println(" People:"); + LOGGER.log(LogLevel.VERBOSE, () -> " People:"); for (DetectedPerson person : result.getPeople().getValues()) { - System.out.println(" Bounding box " + person.getBoundingBox() + LOGGER.log(LogLevel.VERBOSE, () -> " Bounding box " + person.getBoundingBox() + ", Confidence " + String.format("%.4f", person.getConfidence())); } } if (result.getSmartCrops() != null) { - System.out.println(" Crop Suggestions:"); + LOGGER.log(LogLevel.VERBOSE, () -> " Crop Suggestions:"); for (CropRegion cropRegion : result.getSmartCrops().getValues()) { - System.out.println(" Aspect ratio " + cropRegion.getAspectRatio() + LOGGER.log(LogLevel.VERBOSE, () -> " Aspect ratio " + cropRegion.getAspectRatio() + ": Bounding box " + cropRegion.getBoundingBox()); } } if (result.getRead() != null) { - System.out.println(" Read:"); + LOGGER.log(LogLevel.VERBOSE, () -> " Read:"); for (DetectedTextLine line : result.getRead().getBlocks().get(0).getLines()) { - System.out.println(" Line: '" + line.getText() + LOGGER.log(LogLevel.VERBOSE, () -> " Line: '" + line.getText() + "', Bounding polygon " + line.getBoundingPolygon()); for (DetectedTextWord word : line.getWords()) { - System.out.println(" Word: '" + word.getText() + LOGGER.log(LogLevel.VERBOSE, () -> " Word: '" + word.getText() + "', Bounding polygon " + word.getBoundingPolygon() + ", Confidence " + String.format("%.4f", word.getConfidence())); } } } } catch (Exception e) { - e.printStackTrace(); + LOGGER.log(LogLevel.VERBOSE, () -> "Error printing analysis results", e); } } } diff --git a/sdk/webpubsub/azure-messaging-webpubsub-client/src/test/java/com/azure/messaging/webpubsub/client/GroupMessageTests.java b/sdk/webpubsub/azure-messaging-webpubsub-client/src/test/java/com/azure/messaging/webpubsub/client/GroupMessageTests.java index dd6fc1ad5aff..316e35d9a0db 100644 --- a/sdk/webpubsub/azure-messaging-webpubsub-client/src/test/java/com/azure/messaging/webpubsub/client/GroupMessageTests.java +++ b/sdk/webpubsub/azure-messaging-webpubsub-client/src/test/java/com/azure/messaging/webpubsub/client/GroupMessageTests.java @@ -5,6 +5,8 @@ import com.azure.core.test.annotation.DoNotRecord; import com.azure.core.util.BinaryData; +import com.azure.core.util.logging.ClientLogger; +import com.azure.core.util.logging.LogLevel; import com.azure.messaging.webpubsub.client.models.SendMessageFailedException; import com.azure.messaging.webpubsub.client.models.SendToGroupOptions; import com.azure.messaging.webpubsub.client.models.WebPubSubDataFormat; @@ -18,6 +20,7 @@ import java.util.concurrent.TimeUnit; public class GroupMessageTests extends TestBase { + private static final ClientLogger LOGGER = new ClientLogger(GroupMessageTests.class); private static final String HELLO = "hello"; @@ -178,9 +181,10 @@ public void testSendMessagePerformance() throws InterruptedException { final long endNanoReceive = System.nanoTime(); // about 800 ms for 1k messages - System.out.println("send takes milliseconds: " + (endNanoSend - beginNano) / 1E6); + LOGGER.log(LogLevel.VERBOSE, () -> "send takes milliseconds: " + (endNanoSend - beginNano) / 1E6); // about 1 second for 1k messages - System.out.println("send and receive takes milliseconds: " + (endNanoReceive - beginNano) / 1E6); + LOGGER.log(LogLevel.VERBOSE, + () -> "send and receive takes milliseconds: " + (endNanoReceive - beginNano) / 1E6); } finally { client.stop(); }