Rename E2ETests.Configuration to TestConfiguration to avoid SDK type …

…name conflict
Azure · Jun 18, 2021 · 75034e5 · 75034e5
1 parent 0a1f703
commit 75034e5
Show file tree

Hide file tree

Showing 41 changed files with 180 additions and 180 deletions.
diff --git a/e2e/test/Helpers/StorageContainer.cs b/e2e/test/Helpers/StorageContainer.cs
@@ -136,7 +136,7 @@ protected virtual void Dispose(bool disposing)
 
         private async Task InitializeAsync()
         {
-            CloudStorageAccount storageAccount = CloudStorageAccount.Parse(Configuration.Storage.ConnectionString);
+            CloudStorageAccount storageAccount = CloudStorageAccount.Parse(TestConfiguration.Storage.ConnectionString);
             CloudBlobClient cloudBlobClient = storageAccount.CreateCloudBlobClient();
             CloudBlobContainer = cloudBlobClient.GetContainerReference(ContainerName);
             await CloudBlobContainer.CreateIfNotExistsAsync().ConfigureAwait(false);

diff --git a/e2e/test/Helpers/TestDevice.cs b/e2e/test/Helpers/TestDevice.cs
@@ -72,7 +72,7 @@ private static async Task<TestDevice> CreateDeviceAsync(TestDeviceType type, str
             string deviceName = "E2E_" + prefix + Guid.NewGuid();
 
             // Delete existing devices named this way and create a new one.
-            using var rm = RegistryManager.CreateFromConnectionString(Configuration.IoTHub.ConnectionString);
+            using var rm = RegistryManager.CreateFromConnectionString(TestConfiguration.IoTHub.ConnectionString);
             s_logger.Trace($"{nameof(GetTestDeviceAsync)}: Creating device {deviceName} with type {type}.");
 
             Client.IAuthenticationMethod auth = null;
@@ -84,11 +84,11 @@ private static async Task<TestDevice> CreateDeviceAsync(TestDeviceType type, str
                 {
                     X509Thumbprint = new X509Thumbprint
                     {
-                        PrimaryThumbprint = Configuration.IoTHub.GetCertificateWithPrivateKey().Thumbprint
+                        PrimaryThumbprint = TestConfiguration.IoTHub.GetCertificateWithPrivateKey().Thumbprint
                     }
                 };
 
-                auth = new DeviceAuthenticationWithX509Certificate(deviceName, Configuration.IoTHub.GetCertificateWithPrivateKey());
+                auth = new DeviceAuthenticationWithX509Certificate(deviceName, TestConfiguration.IoTHub.GetCertificateWithPrivateKey());
             }
 
             Device device = null;
@@ -118,15 +118,15 @@ public string ConnectionString
         {
             get
             {
-                string iotHubHostName = GetHostName(Configuration.IoTHub.ConnectionString);
+                string iotHubHostName = GetHostName(TestConfiguration.IoTHub.ConnectionString);
                 return $"HostName={iotHubHostName};DeviceId={Device.Id};SharedAccessKey={Device.Authentication.SymmetricKey.PrimaryKey}";
             }
         }
 
         /// <summary>
         /// Used in conjunction with DeviceClient.Create()
         /// </summary>
-        public string IoTHubHostName => GetHostName(Configuration.IoTHub.ConnectionString);
+        public string IoTHubHostName => GetHostName(TestConfiguration.IoTHub.ConnectionString);
 
         /// <summary>
         /// Device Id
@@ -171,7 +171,7 @@ public DeviceClient CreateDeviceClient(ITransportSettings[] transportSettings, C
                 }
                 else
                 {
-                    deviceClient = DeviceClient.CreateFromConnectionString(Configuration.IoTHub.ConnectionString, Device.Id, transportSettings, options);
+                    deviceClient = DeviceClient.CreateFromConnectionString(TestConfiguration.IoTHub.ConnectionString, Device.Id, transportSettings, options);
                     s_logger.Trace($"{nameof(CreateDeviceClient)}: Created {nameof(DeviceClient)} {Device.Id} from IoTHub connection string: ID={TestLogger.IdOf(deviceClient)}");
                 }
             }
@@ -186,7 +186,7 @@ public DeviceClient CreateDeviceClient(ITransportSettings[] transportSettings, C
 
         public async Task RemoveDeviceAsync()
         {
-            using var rm = RegistryManager.CreateFromConnectionString(Configuration.IoTHub.ConnectionString);
+            using var rm = RegistryManager.CreateFromConnectionString(TestConfiguration.IoTHub.ConnectionString);
             await rm.RemoveDeviceAsync(Id).ConfigureAwait(false);
         }
     }

diff --git a/e2e/test/Helpers/TestModule.cs b/e2e/test/Helpers/TestModule.cs
@@ -28,7 +28,7 @@ public static async Task<TestModule> GetTestModuleAsync(string deviceNamePrefix,
             string deviceName = testDevice.Id;
             string moduleName = "E2E_" + moduleNamePrefix + Guid.NewGuid();
 
-            using var rm = RegistryManager.CreateFromConnectionString(Configuration.IoTHub.ConnectionString);
+            using var rm = RegistryManager.CreateFromConnectionString(TestConfiguration.IoTHub.ConnectionString);
             logger.Trace($"{nameof(GetTestModuleAsync)}: Creating module for device {deviceName}.");
 
             var requestModule = new Module(deviceName, moduleName);
@@ -49,7 +49,7 @@ public string ConnectionString
         {
             get
             {
-                string iotHubHostName = GetHostName(Configuration.IoTHub.ConnectionString);
+                string iotHubHostName = GetHostName(TestConfiguration.IoTHub.ConnectionString);
                 return $"HostName={iotHubHostName};DeviceId={_module.DeviceId};ModuleId={_module.Id};SharedAccessKey={_module.Authentication.SymmetricKey.PrimaryKey}";
             }
         }

diff --git a/....AzureSecurityCenterForIoTLogAnalytics.cs → ....AzureSecurityCenterForIoTLogAnalytics.cs b/....AzureSecurityCenterForIoTLogAnalytics.cs → ....AzureSecurityCenterForIoTLogAnalytics.cs
@@ -3,7 +3,7 @@
 
 namespace Microsoft.Azure.Devices.E2ETests
 {
-    public static partial class Configuration
+    public static partial class TestConfiguration
     {
         public static class AzureSecurityCenterForIoTLogAnalytics
         {

diff --git a/e2e/test/config/Configuration.IoTHub.cs → e2e/test/config/TestConfiguration.IoTHub.cs b/e2e/test/config/Configuration.IoTHub.cs → e2e/test/config/TestConfiguration.IoTHub.cs
@@ -19,7 +19,7 @@
 
 namespace Microsoft.Azure.Devices.E2ETests
 {
-    public static partial class Configuration
+    public static partial class TestConfiguration
     {
         public static partial class IoTHub
         {

diff --git a/...test/config/Configuration.Provisioning.cs → .../config/TestConfiguration.Provisioning.cs b/...test/config/Configuration.Provisioning.cs → .../config/TestConfiguration.Provisioning.cs
@@ -6,7 +6,7 @@
 
 namespace Microsoft.Azure.Devices.E2ETests
 {
-    public static partial class Configuration
+    public static partial class TestConfiguration
     {
         public static partial class Provisioning
         {

diff --git a/e2e/test/config/Configuration.Storage.cs → e2e/test/config/TestConfiguration.Storage.cs b/e2e/test/config/Configuration.Storage.cs → e2e/test/config/TestConfiguration.Storage.cs
@@ -4,7 +4,7 @@
 
 namespace Microsoft.Azure.Devices.E2ETests
 {
-    public static partial class Configuration
+    public static partial class TestConfiguration
     {
         public static class Storage
         {
@@ -17,7 +17,7 @@ public static class Storage
 
             static Storage()
             {
-                ConnectionString = Configuration.GetValue("STORAGE_ACCOUNT_CONNECTION_STRING");
+                ConnectionString = TestConfiguration.GetValue("STORAGE_ACCOUNT_CONNECTION_STRING");
                 Name = s_saName.Match(ConnectionString).Value;
                 Key = s_saKey.Match(ConnectionString).Value;
             }

diff --git a/e2e/test/config/Configuration.cs → e2e/test/config/TestConfiguration.cs b/e2e/test/config/Configuration.cs → e2e/test/config/TestConfiguration.cs
@@ -6,7 +6,7 @@
 
 namespace Microsoft.Azure.Devices.E2ETests
 {
-    public static partial class Configuration
+    public static partial class TestConfiguration
     {
         private static string GetValue(string envName, string defaultValue = null)
         {

diff --git a/e2e/test/iothub/CombinedClientOperationsPoolAmqpTests.cs b/e2e/test/iothub/CombinedClientOperationsPoolAmqpTests.cs
@@ -122,7 +122,7 @@ private async Task DeviceCombinedClientOperationsAsync(
             ConnectionStringAuthScope authScope = ConnectionStringAuthScope.Device)
         {
             // Initialize service client for service-side operations
-            using var serviceClient = ServiceClient.CreateFromConnectionString(Configuration.IoTHub.ConnectionString);
+            using var serviceClient = ServiceClient.CreateFromConnectionString(TestConfiguration.IoTHub.ConnectionString);
 
             // Message payload and properties for C2D operation
             var messagesSent = new Dictionary<string, Tuple<Message, string>>();

diff --git a/e2e/test/iothub/ConnectionStatusChangeHandlerTests.cs b/e2e/test/iothub/ConnectionStatusChangeHandlerTests.cs
@@ -109,7 +109,7 @@ private async Task DeviceClient_Gives_ConnectionStatus_DeviceDisabled_Base(
             TestDevice testDevice = await TestDevice.GetTestDeviceAsync(Logger, DevicePrefix + $"_{Guid.NewGuid()}").ConfigureAwait(false);
             string deviceConnectionString = testDevice.ConnectionString;
 
-            var config = new Configuration.IoTHub.ConnectionStringParser(deviceConnectionString);
+            var config = new TestConfiguration.IoTHub.ConnectionStringParser(deviceConnectionString);
             string deviceId = config.DeviceID;
 
             ConnectionStatus? status = null;
@@ -139,7 +139,7 @@ private async Task DeviceClient_Gives_ConnectionStatus_DeviceDisabled_Base(
                 Assert.IsNotNull(twin);
 
                 // Delete/disable the device in IoT Hub. This should trigger the ConnectionStatusChangesHandler.
-                using (RegistryManager registryManager = RegistryManager.CreateFromConnectionString(Configuration.IoTHub.ConnectionString))
+                using (RegistryManager registryManager = RegistryManager.CreateFromConnectionString(TestConfiguration.IoTHub.ConnectionString))
                 {
                     await registryManagerOperation(registryManager, deviceId).ConfigureAwait(false);
                 }
@@ -198,7 +198,7 @@ private async Task ModuleClient_Gives_ConnectionStatus_DeviceDisabled_Base(
                 Assert.IsNotNull(twin);
 
                 // Delete/disable the device in IoT Hub.
-                using (RegistryManager registryManager = RegistryManager.CreateFromConnectionString(Configuration.IoTHub.ConnectionString))
+                using (RegistryManager registryManager = RegistryManager.CreateFromConnectionString(TestConfiguration.IoTHub.ConnectionString))
                 {
                     await registryManagerOperation(registryManager, testModule.DeviceId).ConfigureAwait(false);
                 }

diff --git a/e2e/test/iothub/DeviceClientX509AuthenticationE2ETests.cs b/e2e/test/iothub/DeviceClientX509AuthenticationE2ETests.cs
@@ -28,7 +28,7 @@ public class DeviceClientX509AuthenticationE2ETests : E2EMsTestBase
 
         public DeviceClientX509AuthenticationE2ETests()
         {
-            _hostName = GetHostName(Configuration.IoTHub.ConnectionString);
+            _hostName = GetHostName(TestConfiguration.IoTHub.ConnectionString);
         }
 
         [LoggedTestMethod]
@@ -148,12 +148,12 @@ public async Task X509_Cert_Chain_Install_Test_MQTT_TCP()
         {
             // arrange
             var chainCerts = new X509Certificate2Collection();
-            chainCerts.Add(Configuration.IoTHub.GetRootCACertificate());
-            chainCerts.Add(Configuration.IoTHub.GetIntermediate1Certificate());
-            chainCerts.Add(Configuration.IoTHub.GetIntermediate2Certificate());
+            chainCerts.Add(TestConfiguration.IoTHub.GetRootCACertificate());
+            chainCerts.Add(TestConfiguration.IoTHub.GetIntermediate1Certificate());
+            chainCerts.Add(TestConfiguration.IoTHub.GetIntermediate2Certificate());
             var auth = new DeviceAuthenticationWithX509Certificate(
-                Configuration.IoTHub.X509ChainDeviceName,
-                Configuration.IoTHub.GetChainDeviceCertificateWithPrivateKey(),
+                TestConfiguration.IoTHub.X509ChainDeviceName,
+                TestConfiguration.IoTHub.GetChainDeviceCertificateWithPrivateKey(),
                 chainCerts);
             using var deviceClient = DeviceClient.Create(
                 _hostName,
@@ -173,12 +173,12 @@ public async Task X509_Cert_Chain_Install_Test_AMQP_TCP()
         {
             // arrange
             var chainCerts = new X509Certificate2Collection();
-            chainCerts.Add(Configuration.IoTHub.GetRootCACertificate());
-            chainCerts.Add(Configuration.IoTHub.GetIntermediate1Certificate());
-            chainCerts.Add(Configuration.IoTHub.GetIntermediate2Certificate());
+            chainCerts.Add(TestConfiguration.IoTHub.GetRootCACertificate());
+            chainCerts.Add(TestConfiguration.IoTHub.GetIntermediate1Certificate());
+            chainCerts.Add(TestConfiguration.IoTHub.GetIntermediate2Certificate());
             var auth = new DeviceAuthenticationWithX509Certificate(
-                Configuration.IoTHub.X509ChainDeviceName,
-                Configuration.IoTHub.GetChainDeviceCertificateWithPrivateKey(),
+                TestConfiguration.IoTHub.X509ChainDeviceName,
+                TestConfiguration.IoTHub.GetChainDeviceCertificateWithPrivateKey(),
                 chainCerts);
             using var deviceClient = DeviceClient.Create(
                 _hostName,
@@ -293,7 +293,7 @@ private async Task X509InvalidDeviceIdOpenAsyncTwiceTest(Client.TransportType tr
         private DeviceClient CreateDeviceClientWithInvalidId(Client.TransportType transportType)
         {
             string deviceName = $"DEVICE_NOT_EXIST_{Guid.NewGuid()}";
-            var auth = new DeviceAuthenticationWithX509Certificate(deviceName, Configuration.IoTHub.GetCertificateWithPrivateKey());
+            var auth = new DeviceAuthenticationWithX509Certificate(deviceName, TestConfiguration.IoTHub.GetCertificateWithPrivateKey());
             return DeviceClient.Create(_hostName, auth, transportType);
         }
     }

diff --git a/e2e/test/iothub/DeviceTokenRefreshE2ETests.cs b/e2e/test/iothub/DeviceTokenRefreshE2ETests.cs
@@ -30,7 +30,7 @@ public async Task DeviceClient_Not_Exist_AMQP()
         {
             TestDevice testDevice = await TestDevice.GetTestDeviceAsync(Logger, DevicePrefix).ConfigureAwait(false);
 
-            var config = new Configuration.IoTHub.ConnectionStringParser(testDevice.ConnectionString);
+            var config = new TestConfiguration.IoTHub.ConnectionStringParser(testDevice.ConnectionString);
             using (DeviceClient deviceClient = DeviceClient.CreateFromConnectionString($"HostName={config.IotHubHostName};DeviceId=device_id_not_exist;SharedAccessKey={config.SharedAccessKey}", Client.TransportType.Amqp_Tcp_Only))
             {
                 await deviceClient.OpenAsync().ConfigureAwait(false);
@@ -43,7 +43,7 @@ public async Task DeviceClient_Bad_Credentials_AMQP()
         {
             TestDevice testDevice = await TestDevice.GetTestDeviceAsync(Logger, DevicePrefix).ConfigureAwait(false);
 
-            var config = new Configuration.IoTHub.ConnectionStringParser(testDevice.ConnectionString);
+            var config = new TestConfiguration.IoTHub.ConnectionStringParser(testDevice.ConnectionString);
             string invalidKey = Convert.ToBase64String(Encoding.UTF8.GetBytes("invalid_key"));
             using (DeviceClient deviceClient = DeviceClient.CreateFromConnectionString($"HostName={config.IotHubHostName};DeviceId={config.DeviceID};SharedAccessKey={invalidKey}", Client.TransportType.Amqp_Tcp_Only))
             {
@@ -82,7 +82,7 @@ public async Task DeviceClient_TokenConnectionDoubleRelease_Ok()
 
             string deviceConnectionString = testDevice.ConnectionString;
 
-            var config = new Configuration.IoTHub.ConnectionStringParser(deviceConnectionString);
+            var config = new TestConfiguration.IoTHub.ConnectionStringParser(deviceConnectionString);
             string iotHub = config.IotHubHostName;
             string deviceId = config.DeviceID;
             string key = config.SharedAccessKey;

diff --git a/e2e/test/iothub/FaultInjectionPoolAmqpTests.cs b/e2e/test/iothub/FaultInjectionPoolAmqpTests.cs
@@ -13,6 +13,6 @@ namespace Microsoft.Azure.Devices.E2ETests
     [TestCategory("LongRunning")]
     public partial class FaultInjectionPoolAmqpTests : E2EMsTestBase
     {
-        private static readonly string s_proxyServerAddress = Configuration.IoTHub.ProxyServerAddress;
+        private static readonly string s_proxyServerAddress = TestConfiguration.IoTHub.ProxyServerAddress;
     }
 }
diff --git a/e2e/test/iothub/FileUploadE2ETests.cs b/e2e/test/iothub/FileUploadE2ETests.cs
@@ -103,7 +103,7 @@ public async Task FileUpload_SmallFile_Http_GranularSteps_Proxy()
             using var fileStreamSource = new FileStream(filename, FileMode.Open, FileAccess.Read);
             var fileUploadTransportSettings = new Http1TransportSettings()
             {
-                Proxy = new WebProxy(Configuration.IoTHub.ProxyServerAddress)
+                Proxy = new WebProxy(TestConfiguration.IoTHub.ProxyServerAddress)
             };
 
             await UploadFileGranularAsync(fileStreamSource, filename, fileUploadTransportSettings).ConfigureAwait(false);
@@ -124,7 +124,7 @@ private async Task UploadFileGranularAsync(Stream source, string filename, Http1
 
             if (x509auth)
             {
-                X509Certificate2 cert = Configuration.IoTHub.GetCertificateWithPrivateKey();
+                X509Certificate2 cert = TestConfiguration.IoTHub.GetCertificateWithPrivateKey();
 
                 var auth = new DeviceAuthenticationWithX509Certificate(testDevice.Id, cert);
                 deviceClient = DeviceClient.Create(testDevice.IoTHubHostName, auth, Client.TransportType.Http1);
@@ -165,7 +165,7 @@ private async Task UploadFileAsync(Client.TransportType transport, string filena
             DeviceClient deviceClient;
             if (x509auth)
             {
-                X509Certificate2 cert = Configuration.IoTHub.GetCertificateWithPrivateKey();
+                X509Certificate2 cert = TestConfiguration.IoTHub.GetCertificateWithPrivateKey();
 
                 var auth = new DeviceAuthenticationWithX509Certificate(testDevice.Id, cert);
                 deviceClient = DeviceClient.Create(testDevice.IoTHubHostName, auth, transport);
@@ -197,7 +197,7 @@ private async Task GetSasUriAsync(Client.TransportType transport, string blobNam
             DeviceClient deviceClient;
             if (x509auth)
             {
-                X509Certificate2 cert = Configuration.IoTHub.GetCertificateWithPrivateKey();
+                X509Certificate2 cert = TestConfiguration.IoTHub.GetCertificateWithPrivateKey();
 
                 var auth = new DeviceAuthenticationWithX509Certificate(testDevice.Id, cert);
                 deviceClient = DeviceClient.Create(testDevice.IoTHubHostName, auth, transport);