diff --git a/sdk/storage/Azure.Storage.DataMovement/tests/TestEventsRaised.cs b/sdk/storage/Azure.Storage.DataMovement/tests/TestEventsRaised.cs index a59a80980526..11030812528b 100644 --- a/sdk/storage/Azure.Storage.DataMovement/tests/TestEventsRaised.cs +++ b/sdk/storage/Azure.Storage.DataMovement/tests/TestEventsRaised.cs @@ -184,9 +184,11 @@ public void AssertContainerCompletedCheck(int transferCount) Assert.IsEmpty(SkippedEvents); // TODO: Reenable check: https://github.com/Azure/azure-sdk-for-net/issues/35976 // Assert.AreEqual(transferCount, SingleCompletedEvents.Count); - Assert.AreEqual(2, StatusEvents.Count); - Assert.AreEqual(StorageTransferStatus.InProgress, StatusEvents.First().StorageTransferStatus); - Assert.AreEqual(StorageTransferStatus.Completed, StatusEvents.ElementAt(1).StorageTransferStatus); + CollectionAssert.AreEqual( + new StorageTransferStatus[] { + StorageTransferStatus.InProgress, + StorageTransferStatus.Completed }, + StatusEvents.Select(e => e.StorageTransferStatus)); } /// @@ -201,10 +203,12 @@ public void AssertContainerCompletedWithFailedCheck(int expectedFailureCount) { Assert.AreEqual(expectedFailureCount, FailedEvents.Count); Assert.IsEmpty(SkippedEvents); - Assert.AreEqual(3, StatusEvents.Count); - Assert.AreEqual(StorageTransferStatus.InProgress, StatusEvents.First().StorageTransferStatus); - Assert.AreEqual(StorageTransferStatus.CancellationInProgress, StatusEvents.ElementAt(1).StorageTransferStatus); - Assert.AreEqual(StorageTransferStatus.CompletedWithFailedTransfers, StatusEvents.ElementAt(2).StorageTransferStatus); + CollectionAssert.AreEqual( + new StorageTransferStatus[] { + StorageTransferStatus.InProgress, + StorageTransferStatus.CancellationInProgress, + StorageTransferStatus.CompletedWithFailedTransfers }, + StatusEvents.Select(e => e.StorageTransferStatus)); } /// @@ -219,9 +223,11 @@ public void AssertContainerCompletedWithFailedCheckContinue(int expectedFailureC { Assert.AreEqual(expectedFailureCount, FailedEvents.Count); Assert.IsEmpty(SkippedEvents); - Assert.AreEqual(2, StatusEvents.Count); - Assert.AreEqual(StorageTransferStatus.InProgress, StatusEvents.First().StorageTransferStatus); - Assert.AreEqual(StorageTransferStatus.CompletedWithFailedTransfers, StatusEvents.ElementAt(1).StorageTransferStatus); + CollectionAssert.AreEqual( + new StorageTransferStatus[] { + StorageTransferStatus.InProgress, + StorageTransferStatus.CompletedWithFailedTransfers }, + StatusEvents.Select(e => e.StorageTransferStatus)); } /// @@ -235,18 +241,22 @@ public void AssertContainerCompletedWithSkippedCheck(int expectedSkipCount) { AssertUnexpectedFailureCheck(); Assert.AreEqual(expectedSkipCount, SkippedEvents.Count); - Assert.AreEqual(2, StatusEvents.Count); - Assert.AreEqual(StorageTransferStatus.InProgress, StatusEvents.First().StorageTransferStatus); - Assert.AreEqual(StorageTransferStatus.CompletedWithSkippedTransfers, StatusEvents.ElementAt(1).StorageTransferStatus); + CollectionAssert.AreEqual( + new StorageTransferStatus[] { + StorageTransferStatus.InProgress, + StorageTransferStatus.CompletedWithSkippedTransfers }, + StatusEvents.Select(e => e.StorageTransferStatus)); } public void AssertPausedCheck() { AssertUnexpectedFailureCheck(); Assert.IsEmpty(SkippedEvents); - Assert.AreEqual(2, StatusEvents.Count); - Assert.AreEqual(StorageTransferStatus.InProgress, StatusEvents.First().StorageTransferStatus); - Assert.AreEqual(StorageTransferStatus.Paused, StatusEvents.ElementAt(1).StorageTransferStatus); + CollectionAssert.AreEqual( + new StorageTransferStatus[] { + StorageTransferStatus.InProgress, + StorageTransferStatus.Paused }, + StatusEvents.Select(e => e.StorageTransferStatus)); } ///