Skip to content

Commit d58f726

Browse files
AzureRTAzureRT
committed
Merge pull request Azure#31 from huangpf/crp2
Crp2
2 parents 9eeef7a + d65123c commit d58f726

File tree

3 files changed

+121
-1
lines changed

3 files changed

+121
-1
lines changed

‎AzurePowershell.Test.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@
208208
<Xunit.Runner.MSBuild.xunit Assemblies="$(ComputeTestDebug)" Html="$(TestOutputDirectory)\ComputeTests.xunit.dll.html" Verbose="false"
209209
ExcludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
210210
</Target>
211-
211+
212212
<!-- Run the sql tests -->
213213
<Target Name="SqlTests">
214214
<Message Importance="high" Text="Running Sql tests" />

‎setup/azurecmdfiles.wxi

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,15 @@
240240
<Component Id="cmp1D51F57A02A3C8949E02ED001784388C" Guid="*">
241241
<File Id="fil1D9D6C76E1B943389910123884F80E38" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\DataFactories\Microsoft.Azure.ResourceManager.dll" />
242242
</Component>
243+
<Component Id="cmp0E60A03D189105D6E7A23E5B6943A5C4" Guid="*">
244+
<File Id="fil0114E75108ED068529C5ADCBB1BFD9DF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\DataFactories\Microsoft.Data.Edm.dll" />
245+
</Component>
246+
<Component Id="cmp0EE9B6E82BF354ED584258F3D7524FCC" Guid="*">
247+
<File Id="filF058DF83A3C7D1C1E4C33B68B512C589" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\DataFactories\Microsoft.Data.OData.dll" />
248+
</Component>
249+
<Component Id="cmp3EF2308A3A5D4416CF0A37CF350381A2" Guid="*">
250+
<File Id="filBD789B715F4C6F58DFFACC4839072346" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\DataFactories\Microsoft.Data.Services.Client.dll" />
251+
</Component>
243252
<Component Id="cmp8549E2CC25A35DDCAD1C042F4E80E254" Guid="*">
244253
<File Id="filF8F961D8FC629431B44B43A76538C334" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\DataFactories\Microsoft.DataFactories.Runtime.dll" />
245254
</Component>
@@ -326,6 +335,15 @@
326335
<Component Id="cmp3B09E1BDCA0B52F9EA656CCC45BD9719" Guid="*">
327336
<File Id="fil25472A8FA7FA8AD458FF3DD90F113F8A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Insights\Microsoft.Azure.ResourceManager.dll" />
328337
</Component>
338+
<Component Id="cmp2591E42374FAC2E1ECB763DEBCAD6CA6" Guid="*">
339+
<File Id="fil026AC17EB4E84AFA3C77F14CA14F4EF8" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Insights\Microsoft.Data.Edm.dll" />
340+
</Component>
341+
<Component Id="cmp32AF78F6912DCA522A0FFAC8FD603B2F" Guid="*">
342+
<File Id="filEC137547A5F97E0CEB774FDE22C6D0BE" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Insights\Microsoft.Data.OData.dll" />
343+
</Component>
344+
<Component Id="cmp27231928A2D67FBC8D981AB504BD21F1" Guid="*">
345+
<File Id="fil469AB2B99910FBDB757FB64FAA43EEF2" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Insights\Microsoft.Data.Services.Client.dll" />
346+
</Component>
329347
<Component Id="cmpE4D93F3591A5E0258D9F3BC7B60DAB6A" Guid="*">
330348
<File Id="fil080BD0B87E23FB9630A97BC7403CF375" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Insights\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
331349
</Component>
@@ -347,6 +365,9 @@
347365
<Component Id="cmp5D4BF2AFED5DA226237313E9C2F8099B" Guid="*">
348366
<File Id="filC27FF716D5D45BE809FDF4A013ED221B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Insights\System.Net.Http.Formatting.dll" />
349367
</Component>
368+
<Component Id="cmp0BBA12BCAEC94783EC690D768E1A9476" Guid="*">
369+
<File Id="fil1AD7EC261964401DA187C10AFD95DF02" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Insights\System.Spatial.dll" />
370+
</Component>
350371
</Directory>
351372
<Directory Id="dirF32F5B70B51A29EED3B6A42F959BE600" Name="KeyVault">
352373
<Component Id="cmpF691ECE2E61383DFBF997C509D946386" Guid="*">
@@ -415,6 +436,9 @@
415436
<Component Id="cmpAD51B1C903B9CB0DB18004F97CD8ADBA" Guid="*">
416437
<File Id="fil3208D4A9BD36690D97F5BC942D634247" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\KeyVault\System.Net.Http.Primitives.dll" />
417438
</Component>
439+
<Component Id="cmp03F452B7335FA9F557105A7C423D8695" Guid="*">
440+
<File Id="filA1447FC0D40ED88A76676B51C5DCD116" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\KeyVault\System.Spatial.dll" />
441+
</Component>
418442
</Directory>
419443
<Directory Id="dir9AF5EA6DDA0D09F66CFEB9FA1B725E4B" Name="NetworkResourceProvider">
420444
<Component Id="cmp0013FA46371D26D810D34C3020ADCA8A" Guid="*">
@@ -782,6 +806,15 @@
782806
<Component Id="cmp455BD6804E7AFF3C169D8BBEA142F350" Guid="*">
783807
<File Id="filB6DAF827AA3819E3724603968C47E81B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\StreamAnalytics\Microsoft.Azure.ResourceManager.dll" />
784808
</Component>
809+
<Component Id="cmpBB7EA343079FE26FE38927CF77F2C51A" Guid="*">
810+
<File Id="fil19775EBEA08FEB2645E093B3FB5DF062" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\StreamAnalytics\Microsoft.Data.Edm.dll" />
811+
</Component>
812+
<Component Id="cmp85D01ED2294B536D8472C9A5B5491A95" Guid="*">
813+
<File Id="filF8E63A75266C8CB45DFCCC0A0F1DC92E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\StreamAnalytics\Microsoft.Data.OData.dll" />
814+
</Component>
815+
<Component Id="cmp0A8A301216E191E94F3BCB9F34E1AF69" Guid="*">
816+
<File Id="filC2B7D5513C8D5D1E0A7DD3F14874E7B7" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\StreamAnalytics\Microsoft.Data.Services.Client.dll" />
817+
</Component>
785818
<Component Id="cmpFA850AB1FD136DBF5C2B996258D7951E" Guid="*">
786819
<File Id="fil9F13D09ABC703F20DA1AF7819335EE2A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\StreamAnalytics\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
787820
</Component>
@@ -827,6 +860,9 @@
827860
<Component Id="cmp50F7BE65E6B760565BEA45A1FD026E5A" Guid="*">
828861
<File Id="fil58ECD5D8224B64964939E2B6FFF6CEAC" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\StreamAnalytics\System.Net.Http.Primitives.dll" />
829862
</Component>
863+
<Component Id="cmp39C80C84537D91210F1CD95CE24DDD6D" Guid="*">
864+
<File Id="fil32E37469BB7EA0E12E1503A1B5B901F3" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\StreamAnalytics\System.Spatial.dll" />
865+
</Component>
830866
</Directory>
831867
<Directory Id="dirB7A521425BBDC8EB5AA06380BBC1E2B3" Name="Tags">
832868
<Component Id="cmp4AC5851471CC40284384D744CCDD8C50" Guid="*">
@@ -1752,6 +1788,9 @@
17521788
<Component Id="cmpBE209ED6509A7E857FD9F9078051DC6A" Guid="*">
17531789
<File Id="fil96FD7FA0CBEE96E0C0239408CD5651A9" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.WindowsAzure.Common.NetFramework.dll" />
17541790
</Component>
1791+
<Component Id="cmpD7A9F76B2346156CA8F83F41A302B714" Guid="*">
1792+
<File Id="fil0218D7505353104A9DB742A55A839351" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.WindowsAzure.Management.dll" />
1793+
</Component>
17551794
<Component Id="cmp4D3E383B38EF4392E70E981B7CA033D7" Guid="*">
17561795
<File Id="fil3D6B846AC421D38C5A9CB40A58B058B6" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.WindowsAzure.Management.SiteRecovery.dll" />
17571796
</Component>
@@ -2774,6 +2813,9 @@
27742813
<ComponentRef Id="cmp17C8052411378D4FBD409F0DBF5A3AAB" />
27752814
<ComponentRef Id="cmp951B200A49755FC237755AA2C77A0E32" />
27762815
<ComponentRef Id="cmp1D51F57A02A3C8949E02ED001784388C" />
2816+
<ComponentRef Id="cmp0E60A03D189105D6E7A23E5B6943A5C4" />
2817+
<ComponentRef Id="cmp0EE9B6E82BF354ED584258F3D7524FCC" />
2818+
<ComponentRef Id="cmp3EF2308A3A5D4416CF0A37CF350381A2" />
27772819
<ComponentRef Id="cmp8549E2CC25A35DDCAD1C042F4E80E254" />
27782820
<ComponentRef Id="cmp2E106693251FC564A4D03DA3778E26F7" />
27792821
<ComponentRef Id="cmp7BF776718E3154F969306B3FB853D175" />
@@ -2802,13 +2844,17 @@
28022844
<ComponentRef Id="cmpB6D50CCF3757EBDA9602AA570BCE0D1E" />
28032845
<ComponentRef Id="cmp04F046DCD3C191FC98D9F1338855F823" />
28042846
<ComponentRef Id="cmp3B09E1BDCA0B52F9EA656CCC45BD9719" />
2847+
<ComponentRef Id="cmp2591E42374FAC2E1ECB763DEBCAD6CA6" />
2848+
<ComponentRef Id="cmp32AF78F6912DCA522A0FFAC8FD603B2F" />
2849+
<ComponentRef Id="cmp27231928A2D67FBC8D981AB504BD21F1" />
28052850
<ComponentRef Id="cmpE4D93F3591A5E0258D9F3BC7B60DAB6A" />
28062851
<ComponentRef Id="cmp969D3C7FCFB07B7318A8A57FCD133108" />
28072852
<ComponentRef Id="cmp209CCEE0DCF9E72717C6DEDE4C8984E1" />
28082853
<ComponentRef Id="cmp7BECB13532E43A81AFC0959E29FF1F56" />
28092854
<ComponentRef Id="cmp5CEBB63124C5833CCFA24A6D28E11CC9" />
28102855
<ComponentRef Id="cmpF5AF8CEC5E3C01F32D02BF852FD840AC" />
28112856
<ComponentRef Id="cmp5D4BF2AFED5DA226237313E9C2F8099B" />
2857+
<ComponentRef Id="cmp0BBA12BCAEC94783EC690D768E1A9476" />
28122858
<ComponentRef Id="cmpF691ECE2E61383DFBF997C509D946386" />
28132859
<ComponentRef Id="cmp4384DC163B139D10A7988F6DCE10A880" />
28142860
<ComponentRef Id="cmp0635B54B2B3E0564FEA476E0C9A701C7" />
@@ -2831,6 +2877,7 @@
28312877
<ComponentRef Id="cmp5CDCB0785A318F614D9422554B3F4ED2" />
28322878
<ComponentRef Id="cmpE90D51E3A3C747163C7F1D6DC5409800" />
28332879
<ComponentRef Id="cmpAD51B1C903B9CB0DB18004F97CD8ADBA" />
2880+
<ComponentRef Id="cmp03F452B7335FA9F557105A7C423D8695" />
28342881
<ComponentRef Id="cmp0013FA46371D26D810D34C3020ADCA8A" />
28352882
<ComponentRef Id="cmpE6890230E9734B840B373ED82DFBA468" />
28362883
<ComponentRef Id="cmp9FB0C9F436D793C5D601D9926AD1792C" />
@@ -2950,6 +2997,9 @@
29502997
<ComponentRef Id="cmp4C4A177B8EA12C43941AF159F0A16E07" />
29512998
<ComponentRef Id="cmpDE1CE796EE504A069B56DCA4A16FD2D7" />
29522999
<ComponentRef Id="cmp455BD6804E7AFF3C169D8BBEA142F350" />
3000+
<ComponentRef Id="cmpBB7EA343079FE26FE38927CF77F2C51A" />
3001+
<ComponentRef Id="cmp85D01ED2294B536D8472C9A5B5491A95" />
3002+
<ComponentRef Id="cmp0A8A301216E191E94F3BCB9F34E1AF69" />
29533003
<ComponentRef Id="cmpFA850AB1FD136DBF5C2B996258D7951E" />
29543004
<ComponentRef Id="cmpB5D013974F5418F70273380DBDD9266F" />
29553005
<ComponentRef Id="cmp13BB804F8DBF8DC64F33621628AE0FEA" />
@@ -2965,6 +3015,7 @@
29653015
<ComponentRef Id="cmp79186A81BC669D6024CCF1A09E2E2C5A" />
29663016
<ComponentRef Id="cmp5A3BD827A14F986178D0A9A181EF2AA5" />
29673017
<ComponentRef Id="cmp50F7BE65E6B760565BEA45A1FD026E5A" />
3018+
<ComponentRef Id="cmp39C80C84537D91210F1CD95CE24DDD6D" />
29683019
<ComponentRef Id="cmp4AC5851471CC40284384D744CCDD8C50" />
29693020
<ComponentRef Id="cmpE1EF08FBA8BC9006E225B9DD83DF428F" />
29703021
<ComponentRef Id="cmp019CEEDFCC1D69922E8F00B5A76B7560" />
@@ -3266,6 +3317,7 @@
32663317
<ComponentRef Id="cmp8CDB44BA783FF24C94CDFC5D12066BB1" />
32673318
<ComponentRef Id="cmpA0A697DEB7822A0EC30F3D359EE930A6" />
32683319
<ComponentRef Id="cmpBE209ED6509A7E857FD9F9078051DC6A" />
3320+
<ComponentRef Id="cmpD7A9F76B2346156CA8F83F41A302B714" />
32693321
<ComponentRef Id="cmp4D3E383B38EF4392E70E981B7CA033D7" />
32703322
<ComponentRef Id="cmp50D44814DFFEA762A53D9DEDCE48F689" />
32713323
<ComponentRef Id="cmp439E7C155DEEFC3877653E4ED11F66AC" />

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

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -442,6 +442,74 @@ private void PerfomrCollectionTestHelper(
442442
Assert.True(trackingIds.Any(t => t.TrackingId == trackingId), "The actual result does not match the expected.");
443443
}
444444

445+
[Fact]
446+
public void SetCollectionAdConfigTest()
447+
{
448+
SetAzureRemoteAppCollection mockCmdlet = SetUpTestCommon<SetAzureRemoteAppCollection>();
449+
string collectionName = "mycol";
450+
System.Security.SecureString password = new System.Security.SecureString();
451+
string expectedTrackingId = "2432145";
452+
CollectionUpdateDetails requestData = null;
453+
string userName = @"Administrator@MyDomain";
454+
Collection expectedCollection = null;
455+
456+
// Required parameters for this test
457+
mockCmdlet.CollectionName = collectionName;
458+
password.AppendChar('p');
459+
mockCmdlet.Credential = new PSCredential(userName, password);
460+
requestData = new CollectionUpdateDetails()
461+
{
462+
AdInfo = new ActiveDirectoryConfig()
463+
{
464+
UserName = userName,
465+
Password = "p"
466+
}
467+
};
468+
469+
expectedCollection = new Collection()
470+
{
471+
Name = collectionName,
472+
Status = "Active",
473+
AdInfo = new ActiveDirectoryConfig()
474+
};
475+
476+
PerformCollectionTestWithAdInfoHelper(mockCmdlet, collectionName, expectedCollection, expectedTrackingId, requestData, false);
477+
}
478+
479+
[Fact]
480+
public void SetInactiveCollectionAdConfigTest()
481+
{
482+
SetAzureRemoteAppCollection mockCmdlet = SetUpTestCommon<SetAzureRemoteAppCollection>();
483+
string collectionName = "mycol";
484+
System.Security.SecureString password = new System.Security.SecureString();
485+
string expectedTrackingId = "fasdfsadfsdf";
486+
CollectionUpdateDetails requestData = null;
487+
string userName = @"MyDomain\Administrator";
488+
Collection expectedCollection = null;
489+
490+
// Required parameters for this test
491+
mockCmdlet.CollectionName = collectionName;
492+
password.AppendChar('f');
493+
mockCmdlet.Credential = new PSCredential(userName, password);
494+
requestData = new CollectionUpdateDetails()
495+
{
496+
AdInfo = new ActiveDirectoryConfig()
497+
{
498+
UserName = userName,
499+
Password = "f"
500+
}
501+
};
502+
503+
expectedCollection = new Collection()
504+
{
505+
Name = collectionName,
506+
Status = "Inactive",
507+
AdInfo = new ActiveDirectoryConfig()
508+
};
509+
510+
PerformCollectionTestWithAdInfoHelper(mockCmdlet, collectionName, expectedCollection, expectedTrackingId, requestData, true);
511+
}
512+
445513
[Fact]
446514
public void RemoveCollection()
447515
{

0 commit comments

Comments
 (0)