Skip to content

Commit a3f7b7e

Browse files
bganapabganapa
committed
Addressing review comments, Converted tests to XUnit tests
1 parent b133851 commit a3f7b7e

File tree

47 files changed

+673
-662
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+673
-662
lines changed

‎src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/EnvironmentSetupHelper.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -571,7 +571,6 @@ private void SetupPowerShellModules(System.Management.Automation.PowerShell powe
571571
foreach (string moduleName in modules)
572572
{
573573
powershell.AddScript(string.Format("Import-Module \"{0}\"", moduleName.AsAbsoluteLocation()));
574-
Console.WriteLine(string.Format("Import-Module \"{0}\"", moduleName.AsAbsoluteLocation()));
575574
}
576575

577576
powershell.AddScript(

‎src/Storage/Stack/Commands.Storage.Test/Blob/Cmdlet/GetAzureStorageContainerTest.cs

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,25 @@
1515
using System;
1616
using System.Collections.Generic;
1717
using System.Linq;
18-
using Microsoft.VisualStudio.TestTools.UnitTesting;
18+
using Microsoft.WindowsAzure.Commands.ScenarioTest;
1919
using Microsoft.WindowsAzure.Commands.Storage.Blob.Cmdlet;
2020
using Microsoft.WindowsAzure.Commands.Storage.Common;
2121
using Microsoft.WindowsAzure.Storage.Blob;
22+
using Xunit;
2223

2324
namespace Microsoft.WindowsAzure.Commands.Storage.Test.Blob.Cmdlet
2425
{
2526
/// <summary>
2627
/// Unit test for get azure storage container cmdlet
2728
/// </summary>
28-
[TestClass]
2929
public class GetAzureStorageContainerTest : StorageBlobTestBase
3030
{
3131
/// <summary>
3232
/// Get azure storage container command
3333
/// </summary>
3434
private GetAzureStorageContainerCommand command = null;
3535

36-
[TestInitialize]
37-
public void InitCommand()
36+
public GetAzureStorageContainerTest()
3837
{
3938
command = new GetAzureStorageContainerCommand(BlobMock)
4039
{
@@ -43,13 +42,8 @@ public void InitCommand()
4342
CurrentBlobCmd = command;
4443
}
4544

46-
[TestCleanup]
47-
public void CleanCommand()
48-
{
49-
command = null;
50-
}
51-
52-
[TestMethod]
45+
[Fact]
46+
[Trait(Category.AcceptanceType, Category.CheckIn)]
5347
public void ListContainersByNameWithInvalidNameTest()
5448
{
5549
string invalidName = "a";
@@ -60,52 +54,57 @@ public void ListContainersByNameWithInvalidNameTest()
6054
String.Format(Resources.InvalidContainerName, invalidName));
6155
}
6256

63-
[TestMethod]
57+
[Fact]
58+
[Trait(Category.AcceptanceType, Category.CheckIn)]
6459
public void ListContainersByNameWithContainerNameTest()
6560
{
6661
AddTestContainers();
6762
IEnumerable<Tuple<CloudBlobContainer, BlobContinuationToken>> containerList = command.ListContainersByName("text");
68-
Assert.AreEqual(1, containerList.Count());
69-
Assert.AreEqual("text", containerList.First().Item1.Name);
63+
Assert.Equal(1, containerList.Count());
64+
Assert.Equal("text", containerList.First().Item1.Name);
7065
}
7166

72-
[TestMethod]
67+
[Fact]
68+
[Trait(Category.AcceptanceType, Category.CheckIn)]
7369
public void ListContainersByNameWithNotExistingContainerTest()
7470
{
7571
string notExistingName = "abcdefg";
7672
AssertThrows<ResourceNotFoundException>(() => command.ListContainersByName(notExistingName).ToList(),
7773
String.Format(Resources.ContainerNotFound, notExistingName));
7874
}
7975

80-
[TestMethod]
76+
[Fact]
77+
[Trait(Category.AcceptanceType, Category.CheckIn)]
8178
public void ListContainerByPrefixWithInvalidPrefixTest()
8279
{
8380
MockCmdRunTime.ResetPipelines();
8481
string prefix = "?";
8582
AssertThrows<ArgumentException>(() => RunAsyncCommand(() => command.ListContainersByPrefix(prefix).ToList()), String.Format(Resources.InvalidContainerName, prefix));
8683
}
8784

88-
[TestMethod]
85+
[Fact]
86+
[Trait(Category.AcceptanceType, Category.CheckIn)]
8987
public void PackCloudBlobContainerWithAclTest()
9088
{
9189
RunAsyncCommand(() => command.PackCloudBlobContainerWithAcl(null));
92-
Assert.IsFalse(MockCmdRunTime.OutputPipeline.Any());
90+
Assert.False(MockCmdRunTime.OutputPipeline.Any());
9391

9492
RunAsyncCommand(() => command.PackCloudBlobContainerWithAcl(BlobMock.ContainerAndTokenList));
95-
Assert.IsFalse(MockCmdRunTime.OutputPipeline.Any());
93+
Assert.False(MockCmdRunTime.OutputPipeline.Any());
9694

9795
AddTestContainers();
9896
RunAsyncCommand(() => command.PackCloudBlobContainerWithAcl(BlobMock.ContainerAndTokenList));
99-
Assert.AreEqual(5, MockCmdRunTime.OutputPipeline.Count());
97+
Assert.Equal(5, MockCmdRunTime.OutputPipeline.Count());
10098
}
10199

102-
[TestMethod]
100+
[Fact]
101+
[Trait(Category.AcceptanceType, Category.CheckIn)]
103102
public void ExecuteCommandGetContainerTest()
104103
{
105104
AddTestContainers();
106105
command.Name = "test";
107106
RunAsyncCommand(() => command.ExecuteCmdlet());
108-
Assert.AreEqual(1, MockCmdRunTime.OutputPipeline.Count);
107+
Assert.Equal(1, MockCmdRunTime.OutputPipeline.Count);
109108
}
110109
}
111110
}

‎src/Storage/Stack/Commands.Storage.Test/Blob/Cmdlet/NewAzureStorageBlobSasTest.cs

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,18 @@
1313
// ---------------------------------------------------------------------------------
1414

1515
using System;
16-
using Microsoft.VisualStudio.TestTools.UnitTesting;
16+
using Microsoft.WindowsAzure.Commands.ScenarioTest;
1717
using Microsoft.WindowsAzure.Commands.Storage.Blob.Cmdlet;
1818
using Microsoft.WindowsAzure.Storage.Blob;
19+
using Xunit;
1920

2021
namespace Microsoft.WindowsAzure.Commands.Storage.Test.Blob.Cmdlet
2122
{
22-
[TestClass]
2323
public class NewAzureStorageBlobSasTest : StorageBlobTestBase
2424
{
2525
public NewAzureStorageBlobSasTokenCommand command = null;
2626

27-
[TestInitialize]
28-
public void InitCommand()
27+
public NewAzureStorageBlobSasTest()
2928
{
3029
command = new NewAzureStorageBlobSasTokenCommand(BlobMock)
3130
{
@@ -34,33 +33,35 @@ public void InitCommand()
3433
CurrentBlobCmd = command;
3534
}
3635

37-
[TestCleanup]
36+
[Fact]
37+
[Trait(Category.AcceptanceType, Category.CheckIn)]
3838
public void CleanCommand()
3939
{
4040
command = null;
4141
}
4242

43-
[TestMethod]
43+
[Fact]
44+
[Trait(Category.AcceptanceType, Category.CheckIn)]
4445
public void SetupAccessPolicyPermissionTest()
4546
{
4647
SharedAccessBlobPolicy accessPolicy = new SharedAccessBlobPolicy();
4748
command.SetupAccessPolicyPermission(accessPolicy, "");
48-
Assert.AreEqual(accessPolicy.Permissions, SharedAccessBlobPermissions.None);
49+
Assert.Equal(accessPolicy.Permissions, SharedAccessBlobPermissions.None);
4950
accessPolicy.Permissions = SharedAccessBlobPermissions.Read;
5051
command.SetupAccessPolicyPermission(accessPolicy, "");
51-
Assert.AreEqual(accessPolicy.Permissions, SharedAccessBlobPermissions.Read);
52+
Assert.Equal(accessPolicy.Permissions, SharedAccessBlobPermissions.Read);
5253
command.SetupAccessPolicyPermission(accessPolicy, "D");
53-
Assert.AreEqual(accessPolicy.Permissions, SharedAccessBlobPermissions.Delete);
54+
Assert.Equal(accessPolicy.Permissions, SharedAccessBlobPermissions.Delete);
5455
command.SetupAccessPolicyPermission(accessPolicy, "DdDdd");
55-
Assert.AreEqual(accessPolicy.Permissions, SharedAccessBlobPermissions.Delete);
56+
Assert.Equal(accessPolicy.Permissions, SharedAccessBlobPermissions.Delete);
5657
command.SetupAccessPolicyPermission(accessPolicy, "DR");
57-
Assert.AreEqual(accessPolicy.Permissions, SharedAccessBlobPermissions.Delete | SharedAccessBlobPermissions.Read);
58+
Assert.Equal(accessPolicy.Permissions, SharedAccessBlobPermissions.Delete | SharedAccessBlobPermissions.Read);
5859
command.SetupAccessPolicyPermission(accessPolicy, "DRrddrrr");
59-
Assert.AreEqual(accessPolicy.Permissions, SharedAccessBlobPermissions.Delete | SharedAccessBlobPermissions.Read);
60+
Assert.Equal(accessPolicy.Permissions, SharedAccessBlobPermissions.Delete | SharedAccessBlobPermissions.Read);
6061
command.SetupAccessPolicyPermission(accessPolicy, "rwd");
61-
Assert.AreEqual(accessPolicy.Permissions, SharedAccessBlobPermissions.Delete | SharedAccessBlobPermissions.Read | SharedAccessBlobPermissions.Write);
62+
Assert.Equal(accessPolicy.Permissions, SharedAccessBlobPermissions.Delete | SharedAccessBlobPermissions.Read | SharedAccessBlobPermissions.Write);
6263
command.SetupAccessPolicyPermission(accessPolicy, "dwr");
63-
Assert.AreEqual(accessPolicy.Permissions, SharedAccessBlobPermissions.Delete | SharedAccessBlobPermissions.Read | SharedAccessBlobPermissions.Write);
64+
Assert.Equal(accessPolicy.Permissions, SharedAccessBlobPermissions.Delete | SharedAccessBlobPermissions.Read | SharedAccessBlobPermissions.Write);
6465
AssertThrows<ArgumentException>(() => command.SetupAccessPolicyPermission(accessPolicy, "rwDl"));
6566
AssertThrows<ArgumentException>(() => command.SetupAccessPolicyPermission(accessPolicy, "x"));
6667
AssertThrows<ArgumentException>(() => command.SetupAccessPolicyPermission(accessPolicy, "rwx"));

‎src/Storage/Stack/Commands.Storage.Test/Blob/Cmdlet/NewAzureStorageContainerSasTest.cs

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,18 @@
1313
// ---------------------------------------------------------------------------------
1414

1515
using System;
16-
using Microsoft.VisualStudio.TestTools.UnitTesting;
16+
using Microsoft.WindowsAzure.Commands.ScenarioTest;
1717
using Microsoft.WindowsAzure.Commands.Storage.Blob.Cmdlet;
1818
using Microsoft.WindowsAzure.Storage.Blob;
19+
using Xunit;
1920

2021
namespace Microsoft.WindowsAzure.Commands.Storage.Test.Blob.Cmdlet
2122
{
22-
[TestClass]
2323
public class NewAzureStorageContainerSasTest : StorageBlobTestBase
2424
{
2525
public NewAzureStorageContainerSasTokenCommand command = null;
2626

27-
[TestInitialize]
28-
public void InitCommand()
27+
public NewAzureStorageContainerSasTest()
2928
{
3029
command = new NewAzureStorageContainerSasTokenCommand(BlobMock)
3130
{
@@ -34,32 +33,27 @@ public void InitCommand()
3433
CurrentBlobCmd = command;
3534
}
3635

37-
[TestCleanup]
38-
public void CleanCommand()
39-
{
40-
command = null;
41-
}
42-
43-
[TestMethod]
36+
[Fact]
37+
[Trait(Category.AcceptanceType, Category.CheckIn)]
4438
public void SetupAccessPolicyPermissionTest()
4539
{
4640
SharedAccessBlobPolicy accessPolicy = new SharedAccessBlobPolicy();
4741
command.SetupAccessPolicyPermission(accessPolicy, "");
48-
Assert.AreEqual(accessPolicy.Permissions, SharedAccessBlobPermissions.None);
42+
Assert.Equal(accessPolicy.Permissions, SharedAccessBlobPermissions.None);
4943
accessPolicy.Permissions = SharedAccessBlobPermissions.Read;
5044
command.SetupAccessPolicyPermission(accessPolicy, "");
51-
Assert.AreEqual(accessPolicy.Permissions, SharedAccessBlobPermissions.Read);
45+
Assert.Equal(accessPolicy.Permissions, SharedAccessBlobPermissions.Read);
5246
command.SetupAccessPolicyPermission(accessPolicy, "D");
53-
Assert.AreEqual(accessPolicy.Permissions, SharedAccessBlobPermissions.Delete);
47+
Assert.Equal(accessPolicy.Permissions, SharedAccessBlobPermissions.Delete);
5448
command.SetupAccessPolicyPermission(accessPolicy, "rrR");
55-
Assert.AreEqual(accessPolicy.Permissions, SharedAccessBlobPermissions.Read);
49+
Assert.Equal(accessPolicy.Permissions, SharedAccessBlobPermissions.Read);
5650
command.SetupAccessPolicyPermission(accessPolicy, "DR");
57-
Assert.AreEqual(accessPolicy.Permissions, SharedAccessBlobPermissions.Delete | SharedAccessBlobPermissions.Read);
51+
Assert.Equal(accessPolicy.Permissions, SharedAccessBlobPermissions.Delete | SharedAccessBlobPermissions.Read);
5852
command.SetupAccessPolicyPermission(accessPolicy, "rwDl");
59-
Assert.AreEqual(accessPolicy.Permissions, SharedAccessBlobPermissions.Delete |
53+
Assert.Equal(accessPolicy.Permissions, SharedAccessBlobPermissions.Delete |
6054
SharedAccessBlobPermissions.Read | SharedAccessBlobPermissions.List | SharedAccessBlobPermissions.Write);
6155
command.SetupAccessPolicyPermission(accessPolicy, "Dlrw");
62-
Assert.AreEqual(accessPolicy.Permissions, SharedAccessBlobPermissions.Delete |
56+
Assert.Equal(accessPolicy.Permissions, SharedAccessBlobPermissions.Delete |
6357
SharedAccessBlobPermissions.Read | SharedAccessBlobPermissions.List | SharedAccessBlobPermissions.Write);
6458
AssertThrows<ArgumentException>(() => command.SetupAccessPolicyPermission(accessPolicy, "x"));
6559
AssertThrows<ArgumentException>(() => command.SetupAccessPolicyPermission(accessPolicy, "rwx"));

‎src/Storage/Stack/Commands.Storage.Test/Blob/Cmdlet/NewAzureStorageContainerTest.cs

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,21 @@
1414

1515
using System;
1616
using System.Linq;
17-
using Microsoft.VisualStudio.TestTools.UnitTesting;
1817
using Microsoft.WindowsAzure.Commands.Common.Storage.ResourceModel;
18+
using Microsoft.WindowsAzure.Commands.ScenarioTest;
1919
using Microsoft.WindowsAzure.Commands.Storage.Blob.Cmdlet;
2020
using Microsoft.WindowsAzure.Commands.Storage.Common;
2121
using Microsoft.WindowsAzure.Commands.Storage.Model.ResourceModel;
2222
using Microsoft.WindowsAzure.Storage.Blob;
23+
using Xunit;
2324

2425
namespace Microsoft.WindowsAzure.Commands.Storage.Test.Blob
2526
{
26-
[TestClass]
2727
public class NewAzureStorageContainerTest : StorageBlobTestBase
2828
{
2929
public NewAzureStorageContainerCommand command = null;
3030

31-
[TestInitialize]
32-
public void InitCommand()
31+
public NewAzureStorageContainerTest()
3332
{
3433
command = new NewAzureStorageContainerCommand(BlobMock)
3534
{
@@ -38,13 +37,8 @@ public void InitCommand()
3837
CurrentBlobCmd = command;
3938
}
4039

41-
[TestCleanup]
42-
public void CleanCommand()
43-
{
44-
command = null;
45-
}
46-
47-
[TestMethod]
40+
[Fact]
41+
[Trait(Category.AcceptanceType, Category.CheckIn)]
4842
public void CreateContainerWithInvalidContainerNameTest()
4943
{
5044
string name = String.Empty;
@@ -62,7 +56,8 @@ public void CreateContainerWithInvalidContainerNameTest()
6256
String.Format(Resources.InvalidContainerName, name));
6357
}
6458

65-
[TestMethod]
59+
[Fact]
60+
[Trait(Category.AcceptanceType, Category.CheckIn)]
6661
public void CreateContainerForAlreadyExistsContainerTest()
6762
{
6863
AddTestContainers();
@@ -73,7 +68,8 @@ public void CreateContainerForAlreadyExistsContainerTest()
7368
String.Format(Resources.ContainerAlreadyExists, name));
7469
}
7570

76-
[TestMethod]
71+
[Fact]
72+
[Trait(Category.AcceptanceType, Category.CheckIn)]
7773
public void CreateContainerSuccessfullyTest()
7874
{
7975
string name = String.Empty;
@@ -84,21 +80,22 @@ public void CreateContainerSuccessfullyTest()
8480
command.Name = name;
8581
RunAsyncCommand(() => command.ExecuteCmdlet());
8682
AzureStorageContainer container = (AzureStorageContainer)MockCmdRunTime.OutputPipeline.FirstOrDefault();
87-
Assert.AreEqual("test", container.Name);
83+
Assert.Equal("test", container.Name);
8884

8985
MockCmdRunTime.ResetPipelines();
9086
AssertThrowsAsync<ResourceAlreadyExistException>(() => command.CreateAzureContainer(InitTaskId, BlobMock, name, accesslevel),
9187
String.Format(Resources.ContainerAlreadyExists, name));
9288
}
9389

94-
[TestMethod]
90+
[Fact]
91+
[Trait(Category.AcceptanceType, Category.CheckIn)]
9592
public void ExcuteCommandNewContainerTest()
9693
{
9794
string name = "containername";
9895
command.Name = name;
9996
RunAsyncCommand(() => command.ExecuteCmdlet());
10097
AzureStorageContainer container = (AzureStorageContainer)MockCmdRunTime.OutputPipeline.FirstOrDefault();
101-
Assert.AreEqual(name, container.Name);
98+
Assert.Equal(name, container.Name);
10299
}
103100
}
104101
}

0 commit comments

Comments
 (0)