Skip to content

Commit 87c43f4

Browse files
committed
Test Project fixes
1 parent 757dfad commit 87c43f4

File tree

15 files changed

+2261
-2548
lines changed

15 files changed

+2261
-2548
lines changed

AzurePowershell.Test.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
<XUnitTests Include=".\src\ResourceManager\ApiManagement\Commands.ApiManagement.Test\bin\Debug\Microsoft.Azure.Commands.ApiManagement.Test.dll"/>
8383
<XUnitTests Include=".\src\ResourceManager\Profile\Commands.Profile.Test\bin\Debug\Microsoft.Azure.Commands.Profile.Test.dll"/>
8484
<XUnitTests Include=".\src\ResourceManager\AzureBackup\Commands.AzureBackup.Test\bin\Debug\Microsoft.Azure.Commands.AzureBackup.Test.dll"/>
85-
<XUnitTests Include=".\src\ResourceManager\NotificationHubs\Commands.NotificationHubs.Test\bin\Debug\Microsoft.Azure.Commands.NotificatioHubs.Test.dll"/>
85+
<XUnitTests Include=".\src\ResourceManager\NotificationHubs\Commands.NotificationHubs.Test\bin\Debug\Microsoft.Azure.Commands.NotificationHubs.Test.dll"/>
8686
<XUnitTests Include="@(AsmXUnitTests)"/>
8787
</ItemGroup>
8888
<ItemGroup Condition=" '$(scope)' == 'ServiceManagement' ">

src/ResourceManager/NotificationHubs/Commands.NotificationHubs.Test/Commands.NotificationHubs.Test.csproj

Lines changed: 15 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<ProjectGuid>{EA66BF2C-4E5F-42FE-912C-B62AEB588308}</ProjectGuid>
88
<OutputType>Library</OutputType>
99
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>Microsoft.Azure.Commands.NotificatioHubs.Test</RootNamespace>
11-
<AssemblyName>Microsoft.Azure.Commands.NotificatioHubs.Test</AssemblyName>
10+
<RootNamespace>Microsoft.Azure.Commands.NotificationHubs.Test</RootNamespace>
11+
<AssemblyName>Microsoft.Azure.Commands.NotificationHubs.Test</AssemblyName>
1212
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
@@ -50,8 +50,8 @@
5050
<Private>True</Private>
5151
</Reference>
5252
<Reference Include="Microsoft.Azure.Common.Authentication, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
53-
<SpecificVersion>False</SpecificVersion>
54-
<HintPath>..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.3-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
53+
<HintPath>..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.5-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
54+
<Private>True</Private>
5555
</Reference>
5656
<Reference Include="Microsoft.Azure.Common.NetFramework, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5757
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
@@ -72,13 +72,11 @@
7272
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.7-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
7373
<Private>True</Private>
7474
</Reference>
75-
<Reference Include="Microsoft.Azure.Test.Framework, Version=1.0.5687.28567, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
76-
<SpecificVersion>False</SpecificVersion>
77-
<HintPath>..\..\..\packages\Microsoft.Azure.Test.Framework.1.0.5715.36130-prerelease\lib\net45\Microsoft.Azure.Test.Framework.dll</HintPath>
75+
<Reference Include="Microsoft.Azure.Test.Framework">
76+
<HintPath>..\..\..\packages\Microsoft.Azure.Test.Framework.1.0.5772.15967-prerelease\lib\net45\Microsoft.Azure.Test.Framework.dll</HintPath>
7877
</Reference>
79-
<Reference Include="Microsoft.Azure.Test.HttpRecorder, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
80-
<HintPath>..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.0.5470.29127-prerelease\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
81-
<Private>True</Private>
78+
<Reference Include="Microsoft.Azure.Test.HttpRecorder">
79+
<HintPath>..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.0.5772.15967-prerelease\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
8280
</Reference>
8381
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.18.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8482
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.18.206251556\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
@@ -89,11 +87,11 @@
8987
<Private>True</Private>
9088
</Reference>
9189
<Reference Include="Microsoft.Rest.ClientRuntime, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
92-
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.1.2.0\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
90+
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.1.4.1\lib\portable-net45+win8+wpa81\Microsoft.Rest.ClientRuntime.dll</HintPath>
9391
<Private>True</Private>
9492
</Reference>
9593
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
96-
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.Authentication.0.9.3\lib\net45\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll</HintPath>
94+
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.Authentication.0.10.0\lib\net45\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll</HintPath>
9795
<Private>True</Private>
9896
</Reference>
9997
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -113,7 +111,7 @@
113111
<Private>True</Private>
114112
</Reference>
115113
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
116-
<HintPath>..\..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
114+
<HintPath>..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
117115
<Private>True</Private>
118116
</Reference>
119117
<Reference Include="System" />
@@ -162,10 +160,10 @@
162160
<None Include="ScenarioTests\NotificationHubServiceTests.ps1">
163161
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
164162
</None>
165-
<None Include="SessionRecords\Microsoft.Azure.Commands.NotificatioHubs.Test.ScenarioTests.NotificationHubServiceTests\TestCRUDNamespace.json" />
166-
<None Include="SessionRecords\Microsoft.Azure.Commands.NotificatioHubs.Test.ScenarioTests.NotificationHubServiceTests\TestCRUDNamespaceAuthorizationRules.json" />
167-
<None Include="SessionRecords\Microsoft.Azure.Commands.NotificatioHubs.Test.ScenarioTests.NotificationHubServiceTests\TestCRUDNHAuthorizationRules.json" />
168-
<None Include="SessionRecords\Microsoft.Azure.Commands.NotificatioHubs.Test.ScenarioTests.NotificationHubServiceTests\TestCRUDNotificationHub.json" />
163+
<None Include="SessionRecords\Microsoft.Azure.Commands.NotificationHubs.Test.ScenarioTests.NotificationHubServiceTests\TestCRUDNamespace.json" />
164+
<None Include="SessionRecords\Microsoft.Azure.Commands.NotificationHubs.Test.ScenarioTests.NotificationHubServiceTests\TestCRUDNamespaceAuth.json" />
165+
<None Include="SessionRecords\Microsoft.Azure.Commands.NotificationHubs.Test.ScenarioTests.NotificationHubServiceTests\TestCRUDNHAuth.json" />
166+
<None Include="SessionRecords\Microsoft.Azure.Commands.NotificationHubs.Test.ScenarioTests.NotificationHubServiceTests\TestCRUDNotificationHub.json" />
169167
</ItemGroup>
170168
<ItemGroup>
171169
<None Include="Resources\NewNotificationHub.json">
@@ -177,18 +175,5 @@
177175
</ItemGroup>
178176
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
179177
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
180-
<!--<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
181-
<PropertyGroup>
182-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
183-
</PropertyGroup>
184-
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
185-
<Error Condition="!Exists('..\..\..\packages\xunit.core.2.1.0-rc1-build3168\build\portable-net45+win8+wp8+wpa81\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\xunit.core.2.1.0-rc1-build3168\build\portable-net45+win8+wp8+wpa81\xunit.core.props'))" />
186-
<Error Condition="!Exists('..\..\..\packages\xunit.core.2.1.0-rc2-build3176\build\portable-net45+win8+wp8+wpa81\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\xunit.core.2.1.0-rc2-build3176\build\portable-net45+win8+wp8+wpa81\xunit.core.props'))" />
187-
</Target>-->
188178
<Import Project="..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
189-
<!--<Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
190-
<Error Condition="!Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
191-
<Error Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
192-
</Target>-->
193-
194179
</Project>

src/ResourceManager/NotificationHubs/Commands.NotificationHubs.Test/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
// General Information about an assembly is controlled through the following
66
// set of attributes. Change these attribute values to modify the information
77
// associated with an assembly.
8-
[assembly: AssemblyTitle("Commands.NotificatioHubs.Test")]
8+
[assembly: AssemblyTitle("Commands.NotificationHubs.Test")]
99
[assembly: AssemblyDescription("")]
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("")]
12-
[assembly: AssemblyProduct("Commands.NotificatioHubs.Test")]
12+
[assembly: AssemblyProduct("Commands.NotificationHubs.Test")]
1313
[assembly: AssemblyCopyright("Copyright © 2015")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]

src/ResourceManager/NotificationHubs/Commands.NotificationHubs.Test/ScenarioTests/NotificationHubServiceTests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15-
namespace Microsoft.Azure.Commands.NotificatioHubs.Test.ScenarioTests
15+
namespace Microsoft.Azure.Commands.NotificationHubs.Test.ScenarioTests
1616
{
1717
using Microsoft.Azure.Commands.NotificationHubs;
1818
using Microsoft.WindowsAzure.Commands.ScenarioTest;
@@ -31,9 +31,9 @@ public void TestCRUDNamespace()
3131

3232
[Fact]
3333
[Trait(Category.AcceptanceType, Category.CheckIn)]
34-
public void TestCRUDNamespaceAuthorizationRules()
34+
public void TestCRUDNamespaceAuth()
3535
{
36-
RunPowerShellTest("Test-CRUDNamespaceAuthorizationRules");
36+
RunPowerShellTest("Test-CRUDNamespaceAuth");
3737
}
3838

3939
[Fact]
@@ -45,9 +45,9 @@ public void TestCRUDNotificationHub()
4545

4646
[Fact]
4747
[Trait(Category.AcceptanceType, Category.CheckIn)]
48-
public void TestCRUDNHAuthorizationRules()
48+
public void TestCRUDNHAuth()
4949
{
50-
RunPowerShellTest("Test-CRUDNHAuthorizationRules");
50+
RunPowerShellTest("Test-CRUDNHAuth");
5151
}
5252
}
5353
}

src/ResourceManager/NotificationHubs/Commands.NotificationHubs.Test/ScenarioTests/NotificationHubServiceTests.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ function Test-CRUDNamespace
164164
.SYNOPSIS
165165
Tests NotificationHub Namespace AuthorizationRules Create List Remove operations.
166166
#>
167-
function Test-CRUDNamespaceAuthorizationRules
167+
function Test-CRUDNamespaceAuth
168168
{
169169
# Setup
170170
$location = "South Central US"
@@ -431,7 +431,7 @@ function Test-CRUDNotificationHub
431431
.SYNOPSIS
432432
Tests NotificationHub AuthorizationRules Create List Remove operations.
433433
#>
434-
function Test-CRUDNHAuthorizationRules
434+
function Test-CRUDNHAuth
435435
{
436436
# Setup
437437
$location = "South Central US"

src/ResourceManager/NotificationHubs/Commands.NotificationHubs.Test/ScenarioTests/TestBaseClass.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15-
namespace Microsoft.Azure.Commands.NotificatioHubs.Test.ScenarioTests
15+
namespace Microsoft.Azure.Commands.NotificationHubs.Test.ScenarioTests
1616
{
1717
using System;
1818
using Microsoft.WindowsAzure.Commands.ScenarioTest;
@@ -39,11 +39,11 @@ protected void SetupManagementClients()
3939
{
4040
var nhManagementClient = GetNotificationHubsManagementClient();
4141
var resourceManagementClient = GetResourceManagementClient();
42-
var galaryClient = GetGalleryClient();
42+
var gallaryClient = GetGalleryClient();
4343
var authorizationManagementClient = GetAuthorizationManagementClient();
4444
var managementClient = GetManagementClient();
4545

46-
helper.SetupManagementClients(nhManagementClient, resourceManagementClient, galaryClient,
46+
helper.SetupManagementClients(nhManagementClient, resourceManagementClient, gallaryClient,
4747
authorizationManagementClient, managementClient);
4848
}
4949

0 commit comments

Comments
 (0)