Skip to content

Commit 11ee869

Browse files
yadavbdevyadavbdev
committed
Updated based on the Azure CR feedback
1 parent 0d2384d commit 11ee869

22 files changed

+175
-218
lines changed

‎src/ServiceManagement/RemoteApp/Commands.RemoteApp.Tests/Collection/RemoteAppCollection.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ public void GetAllCollections()
6767
Log("The test for Get-AzureRemoteAppCollection with {0} collections completed successfully", countOfExpectedCollections);
6868
}
6969

70-
7170
[TestMethod]
7271
public void GetCollectionsByName()
7372
{
@@ -111,7 +110,6 @@ public void GetCollectionsByName()
111110
Log("The test for Get-AzureRemoteAppCollection with {0} collections completed successfully", countOfExpectedCollections);
112111
}
113112

114-
115113
[TestMethod]
116114
[Ignore]
117115
public void AddCollection()

‎src/ServiceManagement/RemoteApp/Commands.RemoteApp.Tests/Collection/RemoteAppCollectionSessionsTests.cs

Lines changed: 0 additions & 124 deletions
This file was deleted.

‎src/ServiceManagement/RemoteApp/Commands.RemoteApp.Tests/Commands.RemoteApp.Test.csproj

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -111,18 +111,15 @@
111111
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Common.1.4.0\lib\net45\Microsoft.WindowsAzure.Common.dll</HintPath>
112112
</Reference>-->
113113
<Reference Include="Moq, Version=4.2.1402.2112, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
114-
<HintPath>..\..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll</HintPath>
115-
<SpecificVersion>False</SpecificVersion>
114+
<HintPath>..\..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll</HintPath>
115+
<SpecificVersion>False</SpecificVersion>
116116
</Reference>
117117
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
118118
<SpecificVersion>False</SpecificVersion>
119119
<HintPath>..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
120120
</Reference>
121121
<Reference Include="System" />
122-
<Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
123-
<SpecificVersion>False</SpecificVersion>
124-
<HintPath>..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\assembly\GAC_MSIL\System.Management.Automation\v4.0_3.0.0.0__31bf3856ad364e35\System.Management.Automation.dll</HintPath>
125-
</Reference>
122+
<Reference Include="System.Management.Automation" />
126123
<Reference Include="System.Net" />
127124
<Reference Include="System.Net.Http" />
128125
<Reference Include="System.Net.Http.Extensions, Version=2.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">

‎src/ServiceManagement/RemoteApp/Commands.RemoteApp.Tests/Common/CollectionObjects.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ namespace Microsoft.Azure.Commands.Test.RemoteApp.Common
2626

2727
public partial class MockObject
2828
{
29-
3029
public static int SetUpDefaultRemoteAppCollection(Mock<IRemoteAppManagementClient> clientMock, string collectionName)
3130
{
3231
CollectionListResult response = new CollectionListResult();
@@ -126,7 +125,6 @@ public static int SetUpDefaultRemoteAppCollectionCreate(Mock<IRemoteAppManagemen
126125
RequestId = "111-2222-4444"
127126
};
128127

129-
130128
mockTrackingId = new List<TrackingResult>()
131129
{
132130
new TrackingResult(response)
@@ -140,7 +138,6 @@ public static int SetUpDefaultRemoteAppCollectionCreate(Mock<IRemoteAppManagemen
140138
return mockCollectionList.Count;
141139
}
142140

143-
144141
public static int SetUpDefaultRemoteAppCollectionSet(Mock<IRemoteAppManagementClient> clientMock,string collectionName, string subscriptionId, string billingPlan, string imageName, PSCredential credential, string domainName, string trackingId)
145142
{
146143

@@ -278,6 +275,5 @@ public static bool ContainsExpectedRegion(List<string> expectedResult, string ac
278275

279276
return isIdentical;
280277
}
281-
282278
}
283279
}

‎src/ServiceManagement/RemoteApp/Commands.RemoteApp.Tests/Common/MockObject.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ public static string[] ToArray(IList<string> list)
3737
{
3838
return MockObject.ConvertList<string>(list).ToArray();
3939
}
40-
4140
}
4241

4342
public partial class MockObject
@@ -72,7 +71,6 @@ public partial class MockObject
7271

7372
internal static string mockTemplateScript { get; set; }
7473

75-
7674
internal delegate bool Comparer<T>(List<T> list, T o);
7775

7876
internal static List<T> ConvertList<T>(IEnumerable<Object> listOfObjects)
@@ -122,7 +120,6 @@ private static List<T> ExpectedResult<T>()
122120
{
123121
expectedResults = ConvertList<T>(mockVpnList);
124122
}
125-
126123
else if (typeof(T) == typeof(LocalModels.ConsentStatusModel))
127124
{
128125
expectedResults = ConvertList<T>(mockUsersConsents);
@@ -155,7 +152,6 @@ private static List<T> ExpectedResult<T>()
155152
return expectedResults;
156153
}
157154

158-
159155
internal static bool HasExpectedResults<T>(List<T> actualResults, Comparer<T> contains)
160156
{
161157
bool fRet = true;
@@ -169,10 +165,10 @@ internal static bool HasExpectedResults<T>(List<T> actualResults, Comparer<T> co
169165
break;
170166
}
171167
}
168+
172169
return fRet;
173170
}
174171

175-
176172
public static bool ContainsExpectedTrackingId(List<TrackingResult> expectedResult, TrackingResult actual)
177173
{
178174
bool isIdentical = false;

‎src/ServiceManagement/RemoteApp/Commands.RemoteApp.Tests/Common/OperationResult.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ namespace Microsoft.Azure.Commands.Test.RemoteApp.Common
2626

2727
public partial class MockObject
2828
{
29-
3029
public static int SetUpDefaultRemoteAppOperationResult(Mock<IRemoteAppManagementClient> clientMock, string trackingId)
3130
{
3231
ISetup<IRemoteAppManagementClient, Task<RemoteAppOperationStatusResult>> setup = null;
@@ -76,6 +75,5 @@ public static bool ContainsExpectedOperationResult(List<OperationResult> expecte
7675

7776
return isIdentical;
7877
}
79-
8078
}
8179
}

‎src/ServiceManagement/RemoteApp/Commands.RemoteApp.Tests/Common/RemoteApp.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ namespace Microsoft.Azure.Commands.Test.RemoteApp.Common
2626

2727
public partial class MockObject
2828
{
29-
3029
public static int SetUpDefaultRemoteAppApplications(Mock<IRemoteAppManagementClient> clientMock, string collectionName)
3130
{
3231
ISetup<IRemoteAppManagementClient, Task<GetPublishedApplicationListResult>> setup = null;

‎src/ServiceManagement/RemoteApp/Commands.RemoteApp.Tests/Common/TemplateObjects.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ public static int SetUpDefaultRemoteAppTemplates(Mock<IRemoteAppManagementClient
3434
StatusCode = System.Net.HttpStatusCode.Accepted,
3535
};
3636

37-
3837
response.RemoteAppTemplateImageList = new List<TemplateImage>()
3938
{
4039
new TemplateImage()
@@ -86,7 +85,6 @@ public static int SetUpDefaultRemoteAppTemplates(Mock<IRemoteAppManagementClient
8685
}
8786
};
8887

89-
9088
mockTemplates = new List<TemplateImage>();
9189
foreach (TemplateImage image in response.RemoteAppTemplateImageList)
9290
{
@@ -108,7 +106,6 @@ public static int SetUpDefaultRemoteAppTemplates(Mock<IRemoteAppManagementClient
108106
return mockTemplates.Count;
109107
}
110108

111-
112109
public static int SetUpDefaultRemoteAppTemplatesByName(Mock<IRemoteAppManagementClient> clientMock, string imageName)
113110
{
114111
TemplateImageResult response = new TemplateImageResult()

‎src/ServiceManagement/RemoteApp/Commands.RemoteApp.Tests/Common/VNetObjects.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,5 @@ public static bool ContainsExpectedSharedKeyResult(List<VNetOperationStatus> exp
235235

236236
return isIdentical;
237237
}
238-
239238
}
240239
}

‎src/ServiceManagement/RemoteApp/Commands.RemoteApp.Tests/Common/Workspace.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,5 @@ public static bool ContainsExpectedWorkspace(List<Workspace> expectedResult, Wor
9191

9292
return isIdentical;
9393
}
94-
9594
}
9695
}

‎src/ServiceManagement/RemoteApp/Commands.RemoteApp.Tests/RemoteProgram/RemoteAppProgram.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,9 @@ namespace Microsoft.Azure.Commands.Test.RemoteApp
2323
using VisualStudio.TestTools.UnitTesting;
2424

2525
// Publish-AzureRemoteAppProgram, Unpublish-AzureRemoteAppProgram
26-
2726
[TestClass]
2827
public class RemoteAppProgramTest : RemoteAppClientTest
2928
{
30-
3129
[TestMethod]
3230
[Ignore]
3331
public void GetAllRemoteApps()

‎src/ServiceManagement/RemoteApp/Commands.RemoteApp.Tests/SecurityPrincipals/RemoteAppSecurityPrincipals.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,8 @@ namespace Microsoft.Azure.Commands.Test.RemoteApp
2525
[TestClass]
2626
public class AzureRemoteAppServiceUser : RemoteAppClientTest
2727
{
28-
2928
private string userName = "user1";
3029

31-
3230
[TestMethod]
3331
public void GetAllUsers()
3432
{
@@ -72,7 +70,6 @@ public void GetAllUsers()
7270
Log("The test for Get-AzureRemoteAppUser with {0} users completed successfully.", countOfExpectedUsers);
7371
}
7472

75-
7673
[TestMethod]
7774
public void GetUsersByName()
7875
{
@@ -118,7 +115,6 @@ public void GetUsersByName()
118115
Log("The test for Get-AzureRemoteAppUser with {0} users completed successfully.", countOfExpectedUsers);
119116
}
120117

121-
122118
[TestMethod]
123119
public void AddMSAUserThatDoesntExist()
124120
{
@@ -162,7 +158,6 @@ public void AddMSAUserThatDoesntExist()
162158
Log("The test for Add-AzureRemoteAppMSAUser successfully added {0} users the new count is {1}.", countOfNewUsers, countOfExistingUsers + countOfNewUsers);
163159
}
164160

165-
166161
[TestMethod]
167162
public void AddOrgIDUserThatDoesntExist()
168163
{
@@ -207,7 +202,6 @@ public void AddOrgIDUserThatDoesntExist()
207202
Log("The test for Add-AzureRemoteAppOrgIDUser successfully added {0} users the new count is {1}.", countOfNewUsers, countOfExistingUsers + countOfNewUsers);
208203
}
209204

210-
211205
[TestMethod]
212206
public void RemoveMSAUserThatExists()
213207
{

‎src/ServiceManagement/RemoteApp/Commands.RemoteApp.Tests/Templates/RemoteAppTemplates.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@ public void AddTemplate()
152152
Log("The test for New-AzureRemoteAppTemplate completed successfully");
153153
}
154154

155-
156155
[TestMethod]
157156
public void RenameTemplate()
158157
{

‎src/ServiceManagement/RemoteApp/Commands.RemoteApp.Tests/Workspace/RemoteAppWorkspace.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ public class RemoteAppWorkspace : RemoteAppClientTest
2727
string EndUserFeedName = "MockFeed";
2828
string ClientUrl = "https://remoteapp.contoso.com/feed";
2929

30-
3130
[TestMethod]
3231
public void GetWorkspace()
3332
{
@@ -96,6 +95,5 @@ public void SetWorkspace()
9695

9796
Log("The test for Set-AzureRemoteAppWorkspace completed successfully");
9897
}
99-
10098
}
10199
}

0 commit comments

Comments
 (0)