Skip to content

Commit 4950336

Browse files
markcowlmarkcowl
committed
Merge pull request Azure#99 from jackmagic313/build
ADF PowerShell change for sprint 47
2 parents 94ce335 + b9f62b4 commit 4950336

File tree

24 files changed

+4
-3376
lines changed

24 files changed

+4
-3376
lines changed

‎src/ResourceManager/DataFactories/Commands.DataFactories.Test/Commands.DataFactories.Test.csproj

Lines changed: 1 addition & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.18.2-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
6464
</Reference>
6565
<Reference Include="Microsoft.Azure.Management.DataFactories">
66-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.0.15.6-preview\lib\net40\Microsoft.Azure.Management.DataFactories.dll</HintPath>
66+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.0.15.7-preview\lib\net40\Microsoft.Azure.Management.DataFactories.dll</HintPath>
6767
</Reference>
6868
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6969
<SpecificVersion>False</SpecificVersion>
@@ -143,7 +143,6 @@
143143
</Reference>
144144
</ItemGroup>
145145
<ItemGroup>
146-
<Compile Include="ScenarioTests\NamingValidationTests.cs" />
147146
<Compile Include="ScenarioTests\HubTests.cs" />
148147
<Compile Include="UnitTests\GetHubTests.cs" />
149148
<Compile Include="ScenarioTests\DataFactoryGatewayTests.cs" />
@@ -197,15 +196,9 @@
197196
<None Include="ScenarioTests\DataFactoryGatewayTests.ps1">
198197
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
199198
</None>
200-
<None Include="ScenarioTests\NamingValidationTests.ps1">
201-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
202-
</None>
203199
<None Include="ScenarioTests\HubTests.ps1">
204200
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
205201
</None>
206-
<None Include="ScenarioTests\PipelineTests.ps1">
207-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
208-
</None>
209202
<None Include="ScenarioTests\TableTests.ps1">
210203
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
211204
</None>
@@ -233,12 +226,6 @@
233226
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.DataFactoryTests\TestDeleteDataFactoryWithDataFactoryParameter.json">
234227
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
235228
</None>
236-
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.DataFactoryTests\TestGetDataFactoryWithEmptyName.json">
237-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
238-
</None>
239-
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.DataFactoryTests\TestGetDataFactoryWithWhiteSpaceName.json">
240-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
241-
</None>
242229
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.DataFactoryTests\TestGetNonExistingDataFactory.json">
243230
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
244231
</None>
@@ -251,12 +238,6 @@
251238
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.HubTests\TestHubWithDataFactoryParameter.json">
252239
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
253240
</None>
254-
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.LinkedServiceTests\TestGetLinkedServiceWithEmptyName.json">
255-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
256-
</None>
257-
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.LinkedServiceTests\TestGetLinkedServiceWithWhiteSpaceName.json">
258-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
259-
</None>
260241
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.LinkedServiceTests\TestLinkedService.json">
261242
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
262243
</None>
@@ -266,27 +247,6 @@
266247
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.LinkedServiceTests\TestLinkedServiceWithDataFactoryParameter.json">
267248
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
268249
</None>
269-
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.NamingValidationTests\TestInvalidDataFactoryName.json">
270-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
271-
</None>
272-
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.NamingValidationTests\TestInvalidHubName.json">
273-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
274-
</None>
275-
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.NamingValidationTests\TestInvalidPipelineName.json">
276-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
277-
</None>
278-
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.NamingValidationTests\TestInvalidResourceGroupName.json">
279-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
280-
</None>
281-
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.NamingValidationTests\TestInvalidTableName.json">
282-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
283-
</None>
284-
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.TableTests\TestGetTableWithEmptyName.json">
285-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
286-
</None>
287-
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.TableTests\TestGetTableWithWhiteSpaceName.json">
288-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
289-
</None>
290250
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.TableTests\TestTable.json">
291251
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
292252
</None>

‎src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/DataFactoryTests.cs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -38,20 +38,6 @@ public void TestDeleteDataFactoryWithDataFactoryParameter()
3838
RunPowerShellTest("Test-DeleteDataFactoryWithDataFactoryParameter");
3939
}
4040

41-
[Fact]
42-
[Trait(Category.AcceptanceType, Category.CheckIn)]
43-
public void TestGetDataFactoryWithEmptyName()
44-
{
45-
RunPowerShellTest("Test-GetDataFactoryWithEmptyName");
46-
}
47-
48-
[Fact]
49-
[Trait(Category.AcceptanceType, Category.CheckIn)]
50-
public void TestGetDataFactoryWithWhiteSpaceName()
51-
{
52-
RunPowerShellTest("Test-GetDataFactoryWithWhiteSpaceName");
53-
}
54-
5541
[Fact]
5642
public void TestDataFactoryPiping()
5743
{

‎src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/DataFactoryTests.ps1

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -73,38 +73,6 @@ function Test-DeleteDataFactoryWithDataFactoryParameter
7373
Remove-AzureDataFactory -DataFactory $df -Force
7474
}
7575

76-
<#
77-
.SYNOPSIS
78-
Nagative test. Get resources with an empty data factory name.
79-
#>
80-
function Test-GetDataFactoryWithEmptyName
81-
{
82-
$dfname = ""
83-
$rgname = Get-ResourceGroupName
84-
$rglocation = Get-ProviderLocation ResourceManagement
85-
86-
New-AzureResourceGroup -Name $rgname -Location $rglocation -Force
87-
88-
# Test
89-
Assert-ThrowsContains { Get-AzureDataFactory -ResourceGroupName $rgname -Name $dfname } "empty"
90-
}
91-
92-
<#
93-
.SYNOPSIS
94-
Nagative test. Get resources with a data factory name which only contains white space.
95-
#>
96-
function Test-GetDataFactoryWithWhiteSpaceName
97-
{
98-
$dfname = " "
99-
$rgname = Get-ResourceGroupName
100-
$rglocation = Get-ProviderLocation ResourceManagement
101-
102-
New-AzureResourceGroup -Name $rgname -Location $rglocation -Force
103-
104-
# Test
105-
Assert-ThrowsContains { Get-AzureDataFactory -ResourceGroupName $rgname -Name $dfname } "Value cannot be null"
106-
}
107-
10876
<#
10977
.SYNOPSIS
11078
Test piping support.

‎src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/LinkedServiceTests.cs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,6 @@ public void TestLinkedServiceWithDataFactoryParameter()
3131
RunPowerShellTest("Test-LinkedServiceWithDataFactoryParameter");
3232
}
3333

34-
[Fact]
35-
public void TestGetLinkedServiceWithEmptyName()
36-
{
37-
RunPowerShellTest("Test-GetLinkedServiceWithEmptyName");
38-
}
39-
40-
[Fact]
41-
public void TestGetLinkedServiceWithWhiteSpaceName()
42-
{
43-
RunPowerShellTest("Test-GetLinkedServiceWithWhiteSpaceName");
44-
}
45-
4634
[Fact]
4735
public void TestLinkedServicePiping()
4836
{

‎src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/LinkedServiceTests.ps1

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -83,44 +83,6 @@ function Test-LinkedServiceWithDataFactoryParameter
8383
}
8484
}
8585

86-
<#
87-
.SYNOPSIS
88-
Nagative test. Get resources with an empty linked service name.
89-
#>
90-
function Test-GetLinkedServiceWithEmptyName
91-
{
92-
$lsname = ""
93-
$dfname = Get-DataFactoryName
94-
$rgname = Get-ResourceGroupName
95-
$rglocation = Get-ProviderLocation ResourceManagement
96-
$dflocation = Get-ProviderLocation DataFactoryManagement
97-
98-
New-AzureResourceGroup -Name $rgname -Location $rglocation -Force
99-
New-AzureDataFactory -ResourceGroupName $rgname -Name $dfname -Location $dflocation -Force
100-
101-
# Test
102-
Assert-ThrowsContains { Get-AzureDataFactoryLinkedService -ResourceGroupName $rgname -DataFactoryName $dfname -Name $lsname } "null"
103-
}
104-
105-
<#
106-
.SYNOPSIS
107-
Nagative test. Get resources with a linked service name which only contains white space.
108-
#>
109-
function Test-GetLinkedServiceWithWhiteSpaceName
110-
{
111-
$lsname = " "
112-
$dfname = Get-DataFactoryName
113-
$rgname = Get-ResourceGroupName
114-
$rglocation = Get-ProviderLocation ResourceManagement
115-
$dflocation = Get-ProviderLocation DataFactoryManagement
116-
117-
New-AzureResourceGroup -Name $rgname -Location $rglocation -Force
118-
New-AzureDataFactory -ResourceGroupName $rgname -Name $dfname -Location $dflocation -Force
119-
120-
# Test
121-
Assert-ThrowsContains { Get-AzureDataFactoryLinkedService -ResourceGroupName $rgname -DataFactoryName $dfname -Name $lsname } "null"
122-
}
123-
12486
<#
12587
.SYNOPSIS
12688
Test piping support.

‎src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/NamingValidationTests.cs

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

0 commit comments

Comments
 (0)