From fbd12ff65b416c483f9b0b320e34ad50e4c916dc Mon Sep 17 00:00:00 2001 From: Chuang <54572251+xccc-msft@users.noreply.github.com> Date: Wed, 2 Sep 2020 17:20:13 +0800 Subject: [PATCH] mgmt update maven profile (#14728) * mgmt update maven build profile * move TestUtilities to azure-resourcemanager-test * update TestUtilities --- .../azure-resourcemanager-appplatform/pom.xml | 5 ++-- .../azure-resourcemanager-appservice/pom.xml | 5 ++-- .../appservice/FunctionAppsTests.java | 2 +- .../FunctionDeploymentSlotsTests.java | 2 +- .../appservice/WebAppsTests.java | 2 +- .../appservice/ZipDeployTests.java | 2 +- .../pom.xml | 5 ++-- .../azure-resourcemanager-compute/pom.xml | 5 ++-- .../compute/ComputeSkuTests.java | 2 +- .../compute/ComputeUsageOperationsTests.java | 2 +- .../compute/ManagedDiskOperationsTests.java | 2 +- .../compute/SharedGalleryImageTests.java | 2 +- ...rtualMachineCustomImageOperationsTest.java | 2 +- ...lMachineExtensionImageOperationsTests.java | 2 +- .../VirtualMachineImageOperationsTests.java | 2 +- ...lMachineRelatedResourcesDeletionTests.java | 2 +- ...ineScaleSetManagedDiskOperationsTests.java | 2 +- ...VirtualMachineScaleSetOperationsTests.java | 2 +- .../pom.xml | 5 ++-- .../pom.xml | 5 ++-- .../pom.xml | 5 ++-- .../azure-resourcemanager-cosmos/pom.xml | 5 ++-- .../azure-resourcemanager-dns/pom.xml | 5 ++-- .../dns/DnsZoneRecordSetETagTests.java | 2 +- .../azure-resourcemanager-eventhubs/pom.xml | 5 ++-- .../eventhubs/EventHubTests.java | 2 +- .../azure-resourcemanager-keyvault/pom.xml | 5 ++-- .../resourcemanager/keyvault/KeyTests.java | 2 +- .../azure-resourcemanager-monitor/pom.xml | 5 ++-- .../monitor/ActionGroupsTests.java | 2 +- .../resourcemanager/monitor/AlertsTests.java | 2 +- .../monitor/AutoscaleTests.java | 2 +- .../MonitorActivityAndMetricsTests.java | 2 +- .../azure-resourcemanager-msi/pom.xml | 5 ++-- .../azure-resourcemanager-network/pom.xml | 5 ++-- .../ApplicationSecurityGroupTests.java | 2 +- .../network/DdosProtectionPlanTests.java | 2 +- .../network/NetworkUsageOperationsTests.java | 2 +- .../network/RouteFilterTests.java | 2 +- .../azure-resourcemanager-privatedns/pom.xml | 5 ++-- .../PrivateDnsZoneRecordSetETagTests.java | 2 +- .../VirtualNetworkLinkETagTests.java | 2 +- .../azure-resourcemanager-redis/pom.xml | 5 ++-- .../azure-resourcemanager-resources/pom.xml | 25 +++++++++++++----- .../resources/DeploymentsTests.java | 2 +- .../resources/PolicyTests.java | 2 +- .../resources/ProvidersTests.java | 2 +- .../resources/SubscriptionsTests.java | 2 +- .../resources/TenantsTests.java | 2 +- .../azure-resourcemanager-samples/pom.xml | 5 ++-- .../azure-resourcemanager-sql/pom.xml | 5 ++-- .../azure-resourcemanager-storage/pom.xml | 5 ++-- .../storage/UsageOperationsTests.java | 2 +- .../azure-resourcemanager-test/pom.xml | 7 ----- .../test/utils}/TestUtilities.java | 26 ++++++++++++++++--- .../pom.xml | 5 ++-- .../azure-resourcemanager/pom.xml | 5 ++-- .../com/azure/resourcemanager/AzureTests.java | 2 +- .../resourcemanager/TestAvailabilitySet.java | 2 +- .../azure/resourcemanager/TestNetwork.java | 2 +- .../azure/resourcemanager/TestTemplate.java | 2 +- .../TestVirtualMachineSizes.java | 2 +- .../TestVirtualNetworkGateway.java | 2 +- 63 files changed, 121 insertions(+), 120 deletions(-) rename sdk/resourcemanager/{azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/core => azure-resourcemanager-test/src/main/java/com/azure/resourcemanager/test/utils}/TestUtilities.java (57%) diff --git a/sdk/resourcemanager/azure-resourcemanager-appplatform/pom.xml b/sdk/resourcemanager/azure-resourcemanager-appplatform/pom.xml index 474e87b6d9ce6..6e2cc54d4918d 100644 --- a/sdk/resourcemanager/azure-resourcemanager-appplatform/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-appplatform/pom.xml @@ -125,9 +125,8 @@ com.azure.resourcemanager - azure-resourcemanager-resources - 2.0.0-beta.4 - test-jar + azure-resourcemanager-test + 2.0.0-beta.4 test diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/pom.xml b/sdk/resourcemanager/azure-resourcemanager-appservice/pom.xml index 1c48300d3d250..ee22f52dde41e 100644 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-appservice/pom.xml @@ -140,9 +140,8 @@ com.azure.resourcemanager - azure-resourcemanager-resources - 2.0.0-beta.4 - test-jar + azure-resourcemanager-test + 2.0.0-beta.4 test diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/java/com/azure/resourcemanager/appservice/FunctionAppsTests.java b/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/java/com/azure/resourcemanager/appservice/FunctionAppsTests.java index 6dc89c3618080..07ec7d7e350b0 100644 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/java/com/azure/resourcemanager/appservice/FunctionAppsTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/java/com/azure/resourcemanager/appservice/FunctionAppsTests.java @@ -13,7 +13,7 @@ import com.azure.resourcemanager.appservice.models.FunctionRuntimeStack; import com.azure.resourcemanager.appservice.models.PricingTier; import com.azure.resourcemanager.appservice.models.SkuName; -import com.azure.resourcemanager.resources.core.TestUtilities; +import com.azure.resourcemanager.test.utils.TestUtilities; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import com.azure.core.management.profile.AzureProfile; import com.azure.resourcemanager.resources.fluentcore.utils.SdkContext; diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/java/com/azure/resourcemanager/appservice/FunctionDeploymentSlotsTests.java b/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/java/com/azure/resourcemanager/appservice/FunctionDeploymentSlotsTests.java index 0195c1822b4a5..1d56a83963cca 100644 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/java/com/azure/resourcemanager/appservice/FunctionDeploymentSlotsTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/java/com/azure/resourcemanager/appservice/FunctionDeploymentSlotsTests.java @@ -13,7 +13,7 @@ import com.azure.resourcemanager.appservice.models.FunctionDeploymentSlot; import com.azure.resourcemanager.appservice.models.PricingTier; import com.azure.resourcemanager.appservice.models.PythonVersion; -import com.azure.resourcemanager.resources.core.TestUtilities; +import com.azure.resourcemanager.test.utils.TestUtilities; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import java.util.Map; diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/java/com/azure/resourcemanager/appservice/WebAppsTests.java b/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/java/com/azure/resourcemanager/appservice/WebAppsTests.java index 9583fab9a4be5..3b0388a4c0605 100644 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/java/com/azure/resourcemanager/appservice/WebAppsTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/java/com/azure/resourcemanager/appservice/WebAppsTests.java @@ -11,7 +11,7 @@ import com.azure.resourcemanager.appservice.models.RemoteVisualStudioVersion; import com.azure.resourcemanager.appservice.models.WebApp; import com.azure.resourcemanager.appservice.models.WebAppRuntimeStack; -import com.azure.resourcemanager.resources.core.TestUtilities; +import com.azure.resourcemanager.test.utils.TestUtilities; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import com.azure.core.management.profile.AzureProfile; import org.junit.jupiter.api.Assertions; diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/java/com/azure/resourcemanager/appservice/ZipDeployTests.java b/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/java/com/azure/resourcemanager/appservice/ZipDeployTests.java index 1ecf6426bdf7c..89eb46a10a520 100644 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/java/com/azure/resourcemanager/appservice/ZipDeployTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/java/com/azure/resourcemanager/appservice/ZipDeployTests.java @@ -7,7 +7,7 @@ import com.azure.core.test.annotation.DoNotRecord; import com.azure.resourcemanager.appservice.models.FunctionApp; import com.azure.resourcemanager.appservice.models.FunctionEnvelope; -import com.azure.resourcemanager.resources.core.TestUtilities; +import com.azure.resourcemanager.test.utils.TestUtilities; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import com.azure.core.management.profile.AzureProfile; import com.azure.resourcemanager.resources.fluentcore.utils.SdkContext; diff --git a/sdk/resourcemanager/azure-resourcemanager-authorization/pom.xml b/sdk/resourcemanager/azure-resourcemanager-authorization/pom.xml index 0936f8a871176..6e2c4a8d78a72 100644 --- a/sdk/resourcemanager/azure-resourcemanager-authorization/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-authorization/pom.xml @@ -96,9 +96,8 @@ com.azure.resourcemanager - azure-resourcemanager-resources - 2.0.0-beta.4 - test-jar + azure-resourcemanager-test + 2.0.0-beta.4 test diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/pom.xml b/sdk/resourcemanager/azure-resourcemanager-compute/pom.xml index bf1c11ec94dd0..3a44981d6871e 100644 --- a/sdk/resourcemanager/azure-resourcemanager-compute/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-compute/pom.xml @@ -152,9 +152,8 @@ com.azure.resourcemanager - azure-resourcemanager-resources - 2.0.0-beta.4 - test-jar + azure-resourcemanager-test + 2.0.0-beta.4 test diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/ComputeSkuTests.java b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/ComputeSkuTests.java index 298fe5abf0d20..8abe7592c2403 100644 --- a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/ComputeSkuTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/ComputeSkuTests.java @@ -8,7 +8,7 @@ import com.azure.resourcemanager.compute.models.ComputeResourceType; import com.azure.resourcemanager.compute.models.ComputeSku; import com.azure.resourcemanager.compute.models.EncryptionStatus; -import com.azure.resourcemanager.resources.core.TestUtilities; +import com.azure.resourcemanager.test.utils.TestUtilities; import com.azure.resourcemanager.resources.fluentcore.arm.AvailabilityZoneId; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import java.util.HashSet; diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/ComputeUsageOperationsTests.java b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/ComputeUsageOperationsTests.java index cc8714a634511..7a1d2a28fb65f 100644 --- a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/ComputeUsageOperationsTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/ComputeUsageOperationsTests.java @@ -5,7 +5,7 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.resourcemanager.compute.models.ComputeUsage; -import com.azure.resourcemanager.resources.core.TestUtilities; +import com.azure.resourcemanager.test.utils.TestUtilities; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/ManagedDiskOperationsTests.java b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/ManagedDiskOperationsTests.java index 935e3a9ba7e05..f6026861bef64 100644 --- a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/ManagedDiskOperationsTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/ManagedDiskOperationsTests.java @@ -12,7 +12,7 @@ import com.azure.resourcemanager.compute.models.Snapshot; import com.azure.resourcemanager.compute.models.SnapshotSkuType; import com.azure.resourcemanager.resources.models.ResourceGroup; -import com.azure.resourcemanager.resources.core.TestUtilities; +import com.azure.resourcemanager.test.utils.TestUtilities; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import com.azure.core.management.profile.AzureProfile; import org.junit.jupiter.api.Assertions; diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/SharedGalleryImageTests.java b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/SharedGalleryImageTests.java index f4ce90d18c140..f9d1cf69f4ca4 100644 --- a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/SharedGalleryImageTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/SharedGalleryImageTests.java @@ -18,7 +18,7 @@ import com.azure.resourcemanager.compute.models.VirtualMachineCustomImage; import com.azure.resourcemanager.compute.models.VirtualMachineSizeTypes; import com.azure.resourcemanager.compute.models.VirtualMachineUnmanagedDataDisk; -import com.azure.resourcemanager.resources.core.TestUtilities; +import com.azure.resourcemanager.test.utils.TestUtilities; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import com.azure.core.management.profile.AzureProfile; import org.junit.jupiter.api.Assertions; diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineCustomImageOperationsTest.java b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineCustomImageOperationsTest.java index 6c39d0cbc8dd5..d3f6180f197cd 100644 --- a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineCustomImageOperationsTest.java +++ b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineCustomImageOperationsTest.java @@ -17,7 +17,7 @@ import com.azure.resourcemanager.compute.models.VirtualMachineDataDisk; import com.azure.resourcemanager.compute.models.VirtualMachineSizeTypes; import com.azure.resourcemanager.compute.models.VirtualMachineUnmanagedDataDisk; -import com.azure.resourcemanager.resources.core.TestUtilities; +import com.azure.resourcemanager.test.utils.TestUtilities; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import com.azure.core.management.profile.AzureProfile; import com.azure.resourcemanager.storage.models.StorageAccount; diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineExtensionImageOperationsTests.java b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineExtensionImageOperationsTests.java index 64e4083cefdbb..de71f2f79e522 100644 --- a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineExtensionImageOperationsTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineExtensionImageOperationsTests.java @@ -11,7 +11,7 @@ import com.azure.resourcemanager.compute.models.VirtualMachineExtensionImageVersion; import com.azure.resourcemanager.compute.models.VirtualMachineExtensionImageVersions; import com.azure.resourcemanager.compute.models.VirtualMachinePublisher; -import com.azure.resourcemanager.resources.core.TestUtilities; +import com.azure.resourcemanager.test.utils.TestUtilities; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; 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 1a7ddb570b450..ed5a74ba4620a 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 @@ -9,7 +9,7 @@ import com.azure.resourcemanager.compute.models.VirtualMachineOffer; import com.azure.resourcemanager.compute.models.VirtualMachinePublisher; import com.azure.resourcemanager.compute.models.VirtualMachineSku; -import com.azure.resourcemanager.resources.core.TestUtilities; +import com.azure.resourcemanager.test.utils.TestUtilities; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; 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 7405d6b9397c6..dfc70ca598bd9 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 @@ -14,7 +14,7 @@ import com.azure.resourcemanager.network.models.NetworkInterface; import com.azure.resourcemanager.network.models.PublicIpAddress; import com.azure.resourcemanager.resources.models.ResourceGroup; -import com.azure.resourcemanager.resources.core.TestUtilities; +import com.azure.resourcemanager.test.utils.TestUtilities; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import com.azure.resourcemanager.resources.fluentcore.arm.models.Resource; import com.azure.resourcemanager.resources.fluentcore.model.Creatable; diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineScaleSetManagedDiskOperationsTests.java b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineScaleSetManagedDiskOperationsTests.java index 0bd121a3e4454..776278b85d649 100644 --- a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineScaleSetManagedDiskOperationsTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineScaleSetManagedDiskOperationsTests.java @@ -20,7 +20,7 @@ import com.azure.resourcemanager.network.models.LoadBalancer; import com.azure.resourcemanager.network.models.Network; import com.azure.resourcemanager.resources.models.ResourceGroup; -import com.azure.resourcemanager.resources.core.TestUtilities; +import com.azure.resourcemanager.test.utils.TestUtilities; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import com.azure.core.management.profile.AzureProfile; import com.azure.resourcemanager.resources.fluentcore.utils.SdkContext; diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineScaleSetOperationsTests.java b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineScaleSetOperationsTests.java index 236b8030c2ca5..f0ae86ea46041 100644 --- a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineScaleSetOperationsTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineScaleSetOperationsTests.java @@ -46,7 +46,7 @@ import com.azure.resourcemanager.network.models.VirtualMachineScaleSetNicIpConfiguration; import com.azure.resourcemanager.resources.fluentcore.utils.SdkContext; import com.azure.resourcemanager.resources.models.ResourceGroup; -import com.azure.resourcemanager.resources.core.TestUtilities; +import com.azure.resourcemanager.test.utils.TestUtilities; import com.azure.resourcemanager.resources.fluentcore.arm.AvailabilityZoneId; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import com.azure.core.management.profile.AzureProfile; diff --git a/sdk/resourcemanager/azure-resourcemanager-containerinstance/pom.xml b/sdk/resourcemanager/azure-resourcemanager-containerinstance/pom.xml index 8158cf7d4bb98..6b9e8da1391ff 100644 --- a/sdk/resourcemanager/azure-resourcemanager-containerinstance/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-containerinstance/pom.xml @@ -111,9 +111,8 @@ com.azure.resourcemanager - azure-resourcemanager-resources - 2.0.0-beta.4 - test-jar + azure-resourcemanager-test + 2.0.0-beta.4 test diff --git a/sdk/resourcemanager/azure-resourcemanager-containerregistry/pom.xml b/sdk/resourcemanager/azure-resourcemanager-containerregistry/pom.xml index 34b968a338b5a..112e477fef4fa 100644 --- a/sdk/resourcemanager/azure-resourcemanager-containerregistry/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-containerregistry/pom.xml @@ -97,9 +97,8 @@ com.azure.resourcemanager - azure-resourcemanager-resources - 2.0.0-beta.4 - test-jar + azure-resourcemanager-test + 2.0.0-beta.4 test diff --git a/sdk/resourcemanager/azure-resourcemanager-containerservice/pom.xml b/sdk/resourcemanager/azure-resourcemanager-containerservice/pom.xml index 93e979909fdf6..ea86ee56cf0df 100644 --- a/sdk/resourcemanager/azure-resourcemanager-containerservice/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-containerservice/pom.xml @@ -92,9 +92,8 @@ com.azure.resourcemanager - azure-resourcemanager-resources - 2.0.0-beta.4 - test-jar + azure-resourcemanager-test + 2.0.0-beta.4 test diff --git a/sdk/resourcemanager/azure-resourcemanager-cosmos/pom.xml b/sdk/resourcemanager/azure-resourcemanager-cosmos/pom.xml index 7ec4aca7a4fd6..5c76744b75df2 100644 --- a/sdk/resourcemanager/azure-resourcemanager-cosmos/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-cosmos/pom.xml @@ -104,9 +104,8 @@ com.azure.resourcemanager - azure-resourcemanager-resources - 2.0.0-beta.4 - test-jar + azure-resourcemanager-test + 2.0.0-beta.4 test diff --git a/sdk/resourcemanager/azure-resourcemanager-dns/pom.xml b/sdk/resourcemanager/azure-resourcemanager-dns/pom.xml index b51f000f884e9..da8c7fe564be5 100644 --- a/sdk/resourcemanager/azure-resourcemanager-dns/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-dns/pom.xml @@ -102,9 +102,8 @@ com.azure.resourcemanager - azure-resourcemanager-resources - 2.0.0-beta.4 - test-jar + azure-resourcemanager-test + 2.0.0-beta.4 test diff --git a/sdk/resourcemanager/azure-resourcemanager-dns/src/test/java/com/azure/resourcemanager/dns/DnsZoneRecordSetETagTests.java b/sdk/resourcemanager/azure-resourcemanager-dns/src/test/java/com/azure/resourcemanager/dns/DnsZoneRecordSetETagTests.java index 0e4362bc5cf96..a9628550d63ef 100644 --- a/sdk/resourcemanager/azure-resourcemanager-dns/src/test/java/com/azure/resourcemanager/dns/DnsZoneRecordSetETagTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-dns/src/test/java/com/azure/resourcemanager/dns/DnsZoneRecordSetETagTests.java @@ -18,7 +18,7 @@ import com.azure.resourcemanager.dns.models.CaaRecordSet; import com.azure.resourcemanager.dns.models.DnsZone; import com.azure.resourcemanager.dns.models.ZoneType; -import com.azure.resourcemanager.resources.core.TestUtilities; +import com.azure.resourcemanager.test.utils.TestUtilities; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import com.azure.core.management.profile.AzureProfile; import com.azure.resourcemanager.resources.ResourceManager; diff --git a/sdk/resourcemanager/azure-resourcemanager-eventhubs/pom.xml b/sdk/resourcemanager/azure-resourcemanager-eventhubs/pom.xml index 8bc0234f55447..ef47a1a3d99e1 100644 --- a/sdk/resourcemanager/azure-resourcemanager-eventhubs/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-eventhubs/pom.xml @@ -95,9 +95,8 @@ com.azure.resourcemanager - azure-resourcemanager-resources - 2.0.0-beta.4 - test-jar + azure-resourcemanager-test + 2.0.0-beta.4 test diff --git a/sdk/resourcemanager/azure-resourcemanager-eventhubs/src/test/java/com/azure/resourcemanager/eventhubs/EventHubTests.java b/sdk/resourcemanager/azure-resourcemanager-eventhubs/src/test/java/com/azure/resourcemanager/eventhubs/EventHubTests.java index 4b4a0fc52581e..aa46bd2c033a9 100644 --- a/sdk/resourcemanager/azure-resourcemanager-eventhubs/src/test/java/com/azure/resourcemanager/eventhubs/EventHubTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-eventhubs/src/test/java/com/azure/resourcemanager/eventhubs/EventHubTests.java @@ -23,7 +23,7 @@ import com.azure.resourcemanager.eventhubs.models.EventHubNamespaceSkuType; import com.azure.resourcemanager.eventhubs.models.ProvisioningStateDR; import com.azure.resourcemanager.resources.ResourceManager; -import com.azure.resourcemanager.resources.core.TestUtilities; +import com.azure.resourcemanager.test.utils.TestUtilities; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import com.azure.resourcemanager.resources.fluentcore.model.Creatable; import com.azure.core.management.profile.AzureProfile; diff --git a/sdk/resourcemanager/azure-resourcemanager-keyvault/pom.xml b/sdk/resourcemanager/azure-resourcemanager-keyvault/pom.xml index 75b96fff9410b..dd4d786bdbd0f 100644 --- a/sdk/resourcemanager/azure-resourcemanager-keyvault/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-keyvault/pom.xml @@ -111,9 +111,8 @@ com.azure.resourcemanager - azure-resourcemanager-resources - 2.0.0-beta.4 - test-jar + azure-resourcemanager-test + 2.0.0-beta.4 test diff --git a/sdk/resourcemanager/azure-resourcemanager-keyvault/src/test/java/com/azure/resourcemanager/keyvault/KeyTests.java b/sdk/resourcemanager/azure-resourcemanager-keyvault/src/test/java/com/azure/resourcemanager/keyvault/KeyTests.java index 4ab0165e3b344..74fb74f3b3e98 100644 --- a/sdk/resourcemanager/azure-resourcemanager-keyvault/src/test/java/com/azure/resourcemanager/keyvault/KeyTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-keyvault/src/test/java/com/azure/resourcemanager/keyvault/KeyTests.java @@ -7,7 +7,7 @@ import com.azure.core.test.annotation.DoNotRecord; import com.azure.resourcemanager.keyvault.models.Key; import com.azure.resourcemanager.keyvault.models.Vault; -import com.azure.resourcemanager.resources.core.TestUtilities; +import com.azure.resourcemanager.test.utils.TestUtilities; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import com.azure.resourcemanager.resources.fluentcore.utils.SdkContext; import com.azure.security.keyvault.keys.cryptography.models.EncryptionAlgorithm; diff --git a/sdk/resourcemanager/azure-resourcemanager-monitor/pom.xml b/sdk/resourcemanager/azure-resourcemanager-monitor/pom.xml index 86fcf43ddc985..77053ba32de57 100644 --- a/sdk/resourcemanager/azure-resourcemanager-monitor/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-monitor/pom.xml @@ -116,9 +116,8 @@ com.azure.resourcemanager - azure-resourcemanager-resources - 2.0.0-beta.4 - test-jar + azure-resourcemanager-test + 2.0.0-beta.4 test diff --git a/sdk/resourcemanager/azure-resourcemanager-monitor/src/test/java/com/azure/resourcemanager/monitor/ActionGroupsTests.java b/sdk/resourcemanager/azure-resourcemanager-monitor/src/test/java/com/azure/resourcemanager/monitor/ActionGroupsTests.java index 66024a7827afd..ca3b102bd2240 100644 --- a/sdk/resourcemanager/azure-resourcemanager-monitor/src/test/java/com/azure/resourcemanager/monitor/ActionGroupsTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-monitor/src/test/java/com/azure/resourcemanager/monitor/ActionGroupsTests.java @@ -6,7 +6,7 @@ import com.azure.core.http.HttpPipeline; import com.azure.core.http.rest.PagedIterable; import com.azure.resourcemanager.monitor.models.ActionGroup; -import com.azure.resourcemanager.resources.core.TestUtilities; +import com.azure.resourcemanager.test.utils.TestUtilities; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import com.azure.core.management.profile.AzureProfile; import org.junit.jupiter.api.Assertions; diff --git a/sdk/resourcemanager/azure-resourcemanager-monitor/src/test/java/com/azure/resourcemanager/monitor/AlertsTests.java b/sdk/resourcemanager/azure-resourcemanager-monitor/src/test/java/com/azure/resourcemanager/monitor/AlertsTests.java index 2dcbd037c9249..be8c6ddaf6dfb 100644 --- a/sdk/resourcemanager/azure-resourcemanager-monitor/src/test/java/com/azure/resourcemanager/monitor/AlertsTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-monitor/src/test/java/com/azure/resourcemanager/monitor/AlertsTests.java @@ -18,7 +18,7 @@ import com.azure.resourcemanager.monitor.models.MetricAlertRuleTimeAggregation; import com.azure.resourcemanager.monitor.models.MetricDimension; import com.azure.resourcemanager.monitor.models.MetricDynamicAlertCondition; -import com.azure.resourcemanager.resources.core.TestUtilities; +import com.azure.resourcemanager.test.utils.TestUtilities; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import com.azure.core.management.profile.AzureProfile; import com.azure.resourcemanager.storage.models.StorageAccount; diff --git a/sdk/resourcemanager/azure-resourcemanager-monitor/src/test/java/com/azure/resourcemanager/monitor/AutoscaleTests.java b/sdk/resourcemanager/azure-resourcemanager-monitor/src/test/java/com/azure/resourcemanager/monitor/AutoscaleTests.java index b0ccaee46dd56..7a8e3e3ac24cd 100644 --- a/sdk/resourcemanager/azure-resourcemanager-monitor/src/test/java/com/azure/resourcemanager/monitor/AutoscaleTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-monitor/src/test/java/com/azure/resourcemanager/monitor/AutoscaleTests.java @@ -18,7 +18,7 @@ import com.azure.resourcemanager.monitor.models.ScaleRule; import com.azure.resourcemanager.monitor.models.ScaleType; import com.azure.resourcemanager.monitor.models.TimeAggregationType; -import com.azure.resourcemanager.resources.core.TestUtilities; +import com.azure.resourcemanager.test.utils.TestUtilities; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import com.azure.core.management.profile.AzureProfile; import org.junit.jupiter.api.Assertions; 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 515757d3a4fe3..bdf28b7a681a2 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 @@ -12,7 +12,7 @@ import com.azure.resourcemanager.monitor.models.MetricCollection; import com.azure.resourcemanager.monitor.models.MetricDefinition; import com.azure.resourcemanager.monitor.models.ResultType; -import com.azure.resourcemanager.resources.core.TestUtilities; +import com.azure.resourcemanager.test.utils.TestUtilities; import java.time.OffsetDateTime; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/pom.xml b/sdk/resourcemanager/azure-resourcemanager-msi/pom.xml index 2b6e3173eb2e6..6a99b3e819642 100644 --- a/sdk/resourcemanager/azure-resourcemanager-msi/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-msi/pom.xml @@ -97,9 +97,8 @@ com.azure.resourcemanager - azure-resourcemanager-resources - 2.0.0-beta.4 - test-jar + azure-resourcemanager-test + 2.0.0-beta.4 test diff --git a/sdk/resourcemanager/azure-resourcemanager-network/pom.xml b/sdk/resourcemanager/azure-resourcemanager-network/pom.xml index e7099afae1c1f..8ec947c300a75 100644 --- a/sdk/resourcemanager/azure-resourcemanager-network/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-network/pom.xml @@ -114,9 +114,8 @@ com.azure.resourcemanager - azure-resourcemanager-resources - 2.0.0-beta.4 - test-jar + azure-resourcemanager-test + 2.0.0-beta.4 test diff --git a/sdk/resourcemanager/azure-resourcemanager-network/src/test/java/com/azure/resourcemanager/network/ApplicationSecurityGroupTests.java b/sdk/resourcemanager/azure-resourcemanager-network/src/test/java/com/azure/resourcemanager/network/ApplicationSecurityGroupTests.java index 11405e7ea3c3a..160aea36ca783 100644 --- a/sdk/resourcemanager/azure-resourcemanager-network/src/test/java/com/azure/resourcemanager/network/ApplicationSecurityGroupTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-network/src/test/java/com/azure/resourcemanager/network/ApplicationSecurityGroupTests.java @@ -5,7 +5,7 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.resourcemanager.network.models.ApplicationSecurityGroup; -import com.azure.resourcemanager.resources.core.TestUtilities; +import com.azure.resourcemanager.test.utils.TestUtilities; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/sdk/resourcemanager/azure-resourcemanager-network/src/test/java/com/azure/resourcemanager/network/DdosProtectionPlanTests.java b/sdk/resourcemanager/azure-resourcemanager-network/src/test/java/com/azure/resourcemanager/network/DdosProtectionPlanTests.java index e7736985fbd6f..fb5aa2920959b 100644 --- a/sdk/resourcemanager/azure-resourcemanager-network/src/test/java/com/azure/resourcemanager/network/DdosProtectionPlanTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-network/src/test/java/com/azure/resourcemanager/network/DdosProtectionPlanTests.java @@ -4,7 +4,7 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.resourcemanager.network.models.DdosProtectionPlan; -import com.azure.resourcemanager.resources.core.TestUtilities; +import com.azure.resourcemanager.test.utils.TestUtilities; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/sdk/resourcemanager/azure-resourcemanager-network/src/test/java/com/azure/resourcemanager/network/NetworkUsageOperationsTests.java b/sdk/resourcemanager/azure-resourcemanager-network/src/test/java/com/azure/resourcemanager/network/NetworkUsageOperationsTests.java index c1826d5c2bfa0..2639f77fee690 100644 --- a/sdk/resourcemanager/azure-resourcemanager-network/src/test/java/com/azure/resourcemanager/network/NetworkUsageOperationsTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-network/src/test/java/com/azure/resourcemanager/network/NetworkUsageOperationsTests.java @@ -5,7 +5,7 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.resourcemanager.network.models.NetworkUsage; -import com.azure.resourcemanager.resources.core.TestUtilities; +import com.azure.resourcemanager.test.utils.TestUtilities; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/sdk/resourcemanager/azure-resourcemanager-network/src/test/java/com/azure/resourcemanager/network/RouteFilterTests.java b/sdk/resourcemanager/azure-resourcemanager-network/src/test/java/com/azure/resourcemanager/network/RouteFilterTests.java index ec9aab5b15a87..e107015f5ff2b 100644 --- a/sdk/resourcemanager/azure-resourcemanager-network/src/test/java/com/azure/resourcemanager/network/RouteFilterTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-network/src/test/java/com/azure/resourcemanager/network/RouteFilterTests.java @@ -6,7 +6,7 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.resourcemanager.network.models.Access; import com.azure.resourcemanager.network.models.RouteFilter; -import com.azure.resourcemanager.resources.core.TestUtilities; +import com.azure.resourcemanager.test.utils.TestUtilities; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/sdk/resourcemanager/azure-resourcemanager-privatedns/pom.xml b/sdk/resourcemanager/azure-resourcemanager-privatedns/pom.xml index 2b1242f3ac55b..d128f6bb098e1 100644 --- a/sdk/resourcemanager/azure-resourcemanager-privatedns/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-privatedns/pom.xml @@ -96,9 +96,8 @@ com.azure.resourcemanager - azure-resourcemanager-resources - 2.0.0-beta.4 - test-jar + azure-resourcemanager-test + 2.0.0-beta.4 test diff --git a/sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/java/com/azure/resourcemanager/privatedns/PrivateDnsZoneRecordSetETagTests.java b/sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/java/com/azure/resourcemanager/privatedns/PrivateDnsZoneRecordSetETagTests.java index f40f0bd874477..7a5800827470d 100644 --- a/sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/java/com/azure/resourcemanager/privatedns/PrivateDnsZoneRecordSetETagTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/java/com/azure/resourcemanager/privatedns/PrivateDnsZoneRecordSetETagTests.java @@ -15,7 +15,7 @@ import com.azure.resourcemanager.privatedns.models.AaaaRecordSet; import com.azure.resourcemanager.privatedns.models.CnameRecordSet; import com.azure.resourcemanager.privatedns.models.PrivateDnsZone; -import com.azure.resourcemanager.resources.core.TestUtilities; +import com.azure.resourcemanager.test.utils.TestUtilities; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import com.azure.core.management.profile.AzureProfile; import com.azure.resourcemanager.resources.ResourceManager; diff --git a/sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/java/com/azure/resourcemanager/privatedns/VirtualNetworkLinkETagTests.java b/sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/java/com/azure/resourcemanager/privatedns/VirtualNetworkLinkETagTests.java index 8301ac875c706..8e000d0a62b2e 100644 --- a/sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/java/com/azure/resourcemanager/privatedns/VirtualNetworkLinkETagTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-privatedns/src/test/java/com/azure/resourcemanager/privatedns/VirtualNetworkLinkETagTests.java @@ -17,7 +17,7 @@ import com.azure.resourcemanager.privatedns.models.PrivateDnsZone; import com.azure.resourcemanager.privatedns.models.VirtualNetworkLink; import com.azure.resourcemanager.resources.ResourceManager; -import com.azure.resourcemanager.resources.core.TestUtilities; +import com.azure.resourcemanager.test.utils.TestUtilities; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import com.azure.core.management.profile.AzureProfile; import com.azure.resourcemanager.resources.fluentcore.utils.HttpPipelineProvider; diff --git a/sdk/resourcemanager/azure-resourcemanager-redis/pom.xml b/sdk/resourcemanager/azure-resourcemanager-redis/pom.xml index 8959971c9396c..1d1d8b8a88783 100644 --- a/sdk/resourcemanager/azure-resourcemanager-redis/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-redis/pom.xml @@ -102,9 +102,8 @@ com.azure.resourcemanager - azure-resourcemanager-resources - 2.0.0-beta.4 - test-jar + azure-resourcemanager-test + 2.0.0-beta.4 test diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/pom.xml b/sdk/resourcemanager/azure-resourcemanager-resources/pom.xml index 1ddb5ed862065..fdfbea79ce120 100644 --- a/sdk/resourcemanager/azure-resourcemanager-resources/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-resources/pom.xml @@ -96,6 +96,24 @@ test + + + azure-mgmt-sdk-test-jar + + + !maven.test.skip + + + + + com.azure.resourcemanager + azure-resourcemanager-test + 2.0.0-beta.4 + test + + + + @@ -109,13 +127,6 @@ org.apache.maven.plugins maven-jar-plugin 3.1.2 - - - - test-jar - - - 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 8d59653d56453..05fc6754d3e3d 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 @@ -9,7 +9,7 @@ import com.azure.core.management.exception.ManagementException; import com.azure.core.util.polling.LongRunningOperationStatus; import com.azure.core.util.polling.PollResponse; -import com.azure.resourcemanager.resources.core.TestUtilities; +import com.azure.resourcemanager.test.utils.TestUtilities; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import com.azure.resourcemanager.resources.fluentcore.model.Accepted; import com.azure.core.management.profile.AzureProfile; diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/PolicyTests.java b/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/PolicyTests.java index bac87781c2e31..819a513cf2936 100644 --- a/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/PolicyTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/PolicyTests.java @@ -4,7 +4,7 @@ package com.azure.resourcemanager.resources; import com.azure.core.http.rest.PagedIterable; -import com.azure.resourcemanager.resources.core.TestUtilities; +import com.azure.resourcemanager.test.utils.TestUtilities; import com.azure.resourcemanager.resources.models.GenericResource; import com.azure.resourcemanager.resources.models.PolicyAssignment; import com.azure.resourcemanager.resources.models.PolicyDefinition; diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/ProvidersTests.java b/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/ProvidersTests.java index 324be2fa6a68a..caf3c356d3017 100644 --- a/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/ProvidersTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/ProvidersTests.java @@ -4,7 +4,7 @@ package com.azure.resourcemanager.resources; import com.azure.core.http.rest.PagedIterable; -import com.azure.resourcemanager.resources.core.TestUtilities; +import com.azure.resourcemanager.test.utils.TestUtilities; import com.azure.resourcemanager.resources.fluentcore.utils.SdkContext; import com.azure.resourcemanager.resources.models.Provider; import com.azure.resourcemanager.resources.models.ProviderResourceType; diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/SubscriptionsTests.java b/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/SubscriptionsTests.java index 0324ac2b9a5bc..312dd5b159867 100644 --- a/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/SubscriptionsTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/SubscriptionsTests.java @@ -5,7 +5,7 @@ import com.azure.core.http.HttpPipeline; import com.azure.core.http.rest.PagedIterable; -import com.azure.resourcemanager.resources.core.TestUtilities; +import com.azure.resourcemanager.test.utils.TestUtilities; import com.azure.core.management.profile.AzureProfile; import com.azure.resourcemanager.resources.fluentcore.utils.SdkContext; import com.azure.resourcemanager.resources.models.Location; diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/TenantsTests.java b/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/TenantsTests.java index 6c2b3618eac39..bb66aed6eac23 100644 --- a/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/TenantsTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/TenantsTests.java @@ -5,7 +5,7 @@ import com.azure.core.http.HttpPipeline; import com.azure.core.http.rest.PagedIterable; -import com.azure.resourcemanager.resources.core.TestUtilities; +import com.azure.resourcemanager.test.utils.TestUtilities; import com.azure.core.management.profile.AzureProfile; import com.azure.resourcemanager.resources.fluent.inner.TenantIdDescriptionInner; import com.azure.resourcemanager.resources.fluentcore.utils.SdkContext; diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/pom.xml b/sdk/resourcemanager/azure-resourcemanager-samples/pom.xml index 2c55fc7dcefba..a48dfa03796a0 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-samples/pom.xml @@ -176,9 +176,8 @@ com.azure.resourcemanager - azure-resourcemanager-resources - 2.0.0-beta.4 - test-jar + azure-resourcemanager-test + 2.0.0-beta.4 test diff --git a/sdk/resourcemanager/azure-resourcemanager-sql/pom.xml b/sdk/resourcemanager/azure-resourcemanager-sql/pom.xml index 82cc6c748cb13..9ce3764a4affa 100644 --- a/sdk/resourcemanager/azure-resourcemanager-sql/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-sql/pom.xml @@ -101,9 +101,8 @@ com.azure.resourcemanager - azure-resourcemanager-resources - 2.0.0-beta.4 - test-jar + azure-resourcemanager-test + 2.0.0-beta.4 test diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/pom.xml b/sdk/resourcemanager/azure-resourcemanager-storage/pom.xml index 46eef75819927..0d825167a078f 100644 --- a/sdk/resourcemanager/azure-resourcemanager-storage/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-storage/pom.xml @@ -97,9 +97,8 @@ com.azure.resourcemanager - azure-resourcemanager-resources - 2.0.0-beta.4 - test-jar + azure-resourcemanager-test + 2.0.0-beta.4 test diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/src/test/java/com/azure/resourcemanager/storage/UsageOperationsTests.java b/sdk/resourcemanager/azure-resourcemanager-storage/src/test/java/com/azure/resourcemanager/storage/UsageOperationsTests.java index 4367db3415c7f..1415d22dea332 100644 --- a/sdk/resourcemanager/azure-resourcemanager-storage/src/test/java/com/azure/resourcemanager/storage/UsageOperationsTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-storage/src/test/java/com/azure/resourcemanager/storage/UsageOperationsTests.java @@ -4,7 +4,7 @@ package com.azure.resourcemanager.storage; import com.azure.core.http.rest.PagedIterable; -import com.azure.resourcemanager.resources.core.TestUtilities; +import com.azure.resourcemanager.test.utils.TestUtilities; import com.azure.resourcemanager.storage.fluent.inner.UsageInner; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/sdk/resourcemanager/azure-resourcemanager-test/pom.xml b/sdk/resourcemanager/azure-resourcemanager-test/pom.xml index 067124d963fed..160868c95a13c 100644 --- a/sdk/resourcemanager/azure-resourcemanager-test/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-test/pom.xml @@ -76,13 +76,6 @@ org.apache.maven.plugins maven-jar-plugin 3.1.2 - - - - test-jar - - - diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/core/TestUtilities.java b/sdk/resourcemanager/azure-resourcemanager-test/src/main/java/com/azure/resourcemanager/test/utils/TestUtilities.java similarity index 57% rename from sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/core/TestUtilities.java rename to sdk/resourcemanager/azure-resourcemanager-test/src/main/java/com/azure/resourcemanager/test/utils/TestUtilities.java index 22851b2160fbe..31193be20e910 100644 --- a/sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/core/TestUtilities.java +++ b/sdk/resourcemanager/azure-resourcemanager-test/src/main/java/com/azure/resourcemanager/test/utils/TestUtilities.java @@ -1,10 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.resourcemanager.resources.core; +package com.azure.resourcemanager.test.utils; import com.azure.core.http.rest.PagedIterable; +import java.util.Iterator; + /** * Common utility functions for the tests. */ @@ -13,6 +15,7 @@ public class TestUtilities { * Wrapper on the SdkContext.sleep, in case of record mode will not sleep, otherwise sleep. * * @param milliseconds time in milliseconds for which to sleep. + * @param isRecordMode the value indicates whether it is record mode. */ public static void sleep(int milliseconds, boolean isRecordMode) { if (isRecordMode) { @@ -24,15 +27,30 @@ public static void sleep(int milliseconds, boolean isRecordMode) { } } + /** + * Return the size of Iterable collection. + * + * @param iterable the Iterable collection. + * @param the type of the resource + * @return the size of the collection. + */ public static synchronized int getSize(Iterable iterable) { int res = 0; - - for (T t : iterable) { - res++; + Iterator iterator = iterable.iterator(); + while (iterator.hasNext()) { + iterator.next(); + ++res; } return res; } + /** + * Return whether the Iterable collection is empty. + * + * @param iterable the Iterable collection. + * @param the type of the resource + * @return if the collection is empty. + */ public static synchronized boolean isEmpty(PagedIterable iterable) { return !iterable.iterator().hasNext(); } diff --git a/sdk/resourcemanager/azure-resourcemanager-trafficmanager/pom.xml b/sdk/resourcemanager/azure-resourcemanager-trafficmanager/pom.xml index 6fefad1bcf51b..a380bf171bb49 100644 --- a/sdk/resourcemanager/azure-resourcemanager-trafficmanager/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-trafficmanager/pom.xml @@ -97,9 +97,8 @@ com.azure.resourcemanager - azure-resourcemanager-resources - 2.0.0-beta.4 - test-jar + azure-resourcemanager-test + 2.0.0-beta.4 test diff --git a/sdk/resourcemanager/azure-resourcemanager/pom.xml b/sdk/resourcemanager/azure-resourcemanager/pom.xml index 1685593ce4f4c..366d876ba194d 100644 --- a/sdk/resourcemanager/azure-resourcemanager/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager/pom.xml @@ -204,9 +204,8 @@ com.azure.resourcemanager - azure-resourcemanager-resources - 2.0.0-beta.4 - test-jar + azure-resourcemanager-test + 2.0.0-beta.4 test diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/AzureTests.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/AzureTests.java index c42bdf8fc9cf1..53492c1d2a94c 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/AzureTests.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/AzureTests.java @@ -44,7 +44,7 @@ import com.azure.resourcemanager.network.models.SecurityGroupView; import com.azure.resourcemanager.network.models.Topology; import com.azure.resourcemanager.network.models.VerificationIPFlow; -import com.azure.resourcemanager.resources.core.TestUtilities; +import com.azure.resourcemanager.test.utils.TestUtilities; import com.azure.resourcemanager.resources.fluentcore.arm.CountryIsoCode; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import com.azure.resourcemanager.resources.fluentcore.model.Creatable; diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestAvailabilitySet.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestAvailabilitySet.java index c8a17cd8d75e6..b5790a7998bfc 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestAvailabilitySet.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestAvailabilitySet.java @@ -6,7 +6,7 @@ import com.azure.resourcemanager.compute.models.AvailabilitySet; import com.azure.resourcemanager.compute.models.AvailabilitySets; import com.azure.resourcemanager.compute.models.VirtualMachineSize; -import com.azure.resourcemanager.resources.core.TestUtilities; +import com.azure.resourcemanager.test.utils.TestUtilities; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import org.junit.jupiter.api.Assertions; 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 16e71f9d2a006..6a5d5091f42ea 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 @@ -11,7 +11,7 @@ import com.azure.resourcemanager.network.models.ServiceEndpointType; import com.azure.resourcemanager.network.models.Subnet; import com.azure.resourcemanager.network.models.VirtualNetworkPeeringState; -import com.azure.resourcemanager.resources.core.TestUtilities; +import com.azure.resourcemanager.test.utils.TestUtilities; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import com.azure.resourcemanager.resources.fluentcore.model.Creatable; import com.azure.resourcemanager.resources.fluentcore.model.CreatedResources; 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 ff0b157f726a9..6edbde8f07479 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 @@ -5,7 +5,7 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.core.management.exception.ManagementException; import com.azure.resourcemanager.resources.models.ResourceGroups; -import com.azure.resourcemanager.resources.core.TestUtilities; +import com.azure.resourcemanager.test.utils.TestUtilities; import com.azure.resourcemanager.resources.fluentcore.arm.collection.SupportsGettingById; import com.azure.resourcemanager.resources.fluentcore.arm.collection.SupportsGettingByResourceGroup; import com.azure.resourcemanager.resources.fluentcore.arm.implementation.ManagerBase; diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestVirtualMachineSizes.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestVirtualMachineSizes.java index 1995fe76c90b7..16a811f8b4772 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestVirtualMachineSizes.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/TestVirtualMachineSizes.java @@ -8,7 +8,7 @@ import com.azure.resourcemanager.compute.models.VirtualMachine; import com.azure.resourcemanager.compute.models.VirtualMachineSize; import com.azure.resourcemanager.compute.models.VirtualMachines; -import com.azure.resourcemanager.resources.core.TestUtilities; +import com.azure.resourcemanager.test.utils.TestUtilities; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import org.junit.jupiter.api.Assertions; 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 a1a91d828b021..6ca9a0e4aa8c8 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 @@ -11,7 +11,7 @@ import com.azure.resourcemanager.network.models.VirtualNetworkGatewaySkuName; import com.azure.resourcemanager.network.models.VirtualNetworkGateways; import com.azure.resourcemanager.network.NetworkManager; -import com.azure.resourcemanager.resources.core.TestUtilities; +import com.azure.resourcemanager.test.utils.TestUtilities; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import com.azure.resourcemanager.resources.fluentcore.utils.SdkContext; import java.io.File;