Skip to content

Commit 27d3d71

Browse files
author
begoldsm
committed
Shortening test names, fixing bugs
Shortening all test names and re-running them Fixing bugs in documentation Fast failing in Copy File if it exists and isn't meant to be overwritten.
1 parent a4e0316 commit 27d3d71

File tree

18 files changed

+4589
-4586
lines changed

18 files changed

+4589
-4586
lines changed

src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics.Test/Commands.DataLakeAnalytics.Test.csproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,8 @@
160160
</ItemGroup>
161161
<ItemGroup>
162162
<Compile Include="Properties\AssemblyInfo.cs" />
163-
<Compile Include="ScenarioTests\DataLakeAnalyticsTestsBase.cs" />
164-
<Compile Include="ScenarioTests\DataLakeAnalyticsTests.cs" />
163+
<Compile Include="ScenarioTests\AdlaTestsBase.cs" />
164+
<Compile Include="ScenarioTests\AdlaTests.cs" />
165165
</ItemGroup>
166166
<ItemGroup>
167167
<ProjectReference Include="..\..\Common\Commands.ScenarioTests.ResourceManager.Common\Commands.ScenarioTests.ResourceManager.Common.csproj">
@@ -178,19 +178,19 @@
178178
<None Include="packages.config">
179179
<SubType>Designer</SubType>
180180
</None>
181-
<None Include="ScenarioTests\DataLakeAnalyticsTests.ps1">
181+
<None Include="ScenarioTests\AdlaTests.ps1">
182182
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
183183
</None>
184-
<None Include="SessionRecords\Microsoft.Azure.Commands.DataLakeAnalytics.Test.ScenarioTests.DataLakeAnalyticsTests\TestDataLakeAnalyticsAccount.json">
184+
<None Include="SessionRecords\Microsoft.Azure.Commands.DataLakeAnalytics.Test.ScenarioTests.AdlaTests\TestAdlaAccount.json">
185185
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
186186
</None>
187-
<None Include="SessionRecords\Microsoft.Azure.Commands.DataLakeAnalytics.Test.ScenarioTests.DataLakeAnalyticsTests\TestDataLakeAnalyticsJob.json">
187+
<None Include="SessionRecords\Microsoft.Azure.Commands.DataLakeAnalytics.Test.ScenarioTests.AdlaTests\TestAdlaJob.json">
188188
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
189189
</None>
190-
<None Include="SessionRecords\Microsoft.Azure.Commands.DataLakeAnalytics.Test.ScenarioTests.DataLakeAnalyticsTests\TestNegativeDataLakeAnalyticsAccount.json">
190+
<None Include="SessionRecords\Microsoft.Azure.Commands.DataLakeAnalytics.Test.ScenarioTests.AdlaTests\TestNegativeAdlaAccount.json">
191191
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
192192
</None>
193-
<None Include="SessionRecords\Microsoft.Azure.Commands.DataLakeAnalytics.Test.ScenarioTests.DataLakeAnalyticsTests\TestNegativeDataLakeAnalyticsJob.json">
193+
<None Include="SessionRecords\Microsoft.Azure.Commands.DataLakeAnalytics.Test.ScenarioTests.AdlaTests\TestNegativeAdlaJob.json">
194194
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
195195
</None>
196196
</ItemGroup>
Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,39 +18,39 @@ namespace Microsoft.Azure.Commands.DataLakeAnalytics.Test.ScenarioTests
1818
using Microsoft.Azure.Test;
1919
using Xunit;
2020

21-
public class DataLakeAnalyticsTests : DataLakeAnalyticsTestsBase
21+
public class AdlaTests : AdlaTestsBase
2222
{
2323
[Fact]
2424
[Trait(Category.AcceptanceType, Category.CheckIn)]
25-
public void TestDataLakeAnalyticsAccount()
25+
public void TestAdlaAccount()
2626
{
2727
RunPowerShellTest(
2828
string.Format(
2929
"Test-DataLakeAnalyticsAccount -resourceGroupName {0} -accountName {1} -dataLakeAccountName {2} -secondDataLakeAccountName {3} -blobAccountName {4} -blobAccountKey {5} -location '{6}'",
3030
this.resourceGroupName, this.dataLakeAnalyticsAccountName, this.dataLakeStoreAccountName,
3131
this.secondDataLakeStoreAccountName, this.azureBlobStoreName, this.azureBlobStoreAccessKey,
32-
DataLakeAnalyticsTestsBase.resourceGroupLocation));
32+
AdlaTestsBase.resourceGroupLocation));
3333
}
3434

3535
[Fact]
3636
[Trait(Category.AcceptanceType, Category.CheckIn)]
37-
public void TestDataLakeAnalyticsJob()
37+
public void TestAdlaJob()
3838
{
39-
RunPowerShellTest(string.Format("Test-DataLakeAnalyticsJob -resourceGroupName {0} -accountName {1} -dataLakeAccountName {2} -location '{3}'", this.resourceGroupName, this.dataLakeAnalyticsAccountName, this.dataLakeStoreAccountName, DataLakeAnalyticsTestsBase.resourceGroupLocation));
39+
RunPowerShellTest(string.Format("Test-DataLakeAnalyticsJob -resourceGroupName {0} -accountName {1} -dataLakeAccountName {2} -location '{3}'", this.resourceGroupName, this.dataLakeAnalyticsAccountName, this.dataLakeStoreAccountName, AdlaTestsBase.resourceGroupLocation));
4040
}
4141

4242
[Fact]
4343
[Trait(Category.AcceptanceType, Category.CheckIn)]
44-
public void TestNegativeDataLakeAnalyticsAccount()
44+
public void TestNegativeAdlaAccount()
4545
{
46-
RunPowerShellTest(string.Format("Test-NegativeDataLakeAnalyticsAccount -resourceGroupName {0} -accountName {1} -dataLakeAccountName {2} -location '{3}'", this.resourceGroupName, this.dataLakeAnalyticsAccountName, this.dataLakeStoreAccountName, DataLakeAnalyticsTestsBase.resourceGroupLocation));
46+
RunPowerShellTest(string.Format("Test-NegativeDataLakeAnalyticsAccount -resourceGroupName {0} -accountName {1} -dataLakeAccountName {2} -location '{3}'", this.resourceGroupName, this.dataLakeAnalyticsAccountName, this.dataLakeStoreAccountName, AdlaTestsBase.resourceGroupLocation));
4747
}
4848

4949
[Fact]
5050
[Trait(Category.AcceptanceType, Category.CheckIn)]
51-
public void TestNegativeDataLakeAnalyticsJob()
51+
public void TestNegativeAdlaJob()
5252
{
53-
RunPowerShellTest(string.Format("Test-NegativeDataLakeAnalyticsJob -resourceGroupName {0} -accountName {1} -dataLakeAccountName {2} -location '{3}'", this.resourceGroupName, this.dataLakeAnalyticsAccountName, this.dataLakeStoreAccountName, DataLakeAnalyticsTestsBase.resourceGroupLocation));
53+
RunPowerShellTest(string.Format("Test-NegativeDataLakeAnalyticsJob -resourceGroupName {0} -accountName {1} -dataLakeAccountName {2} -location '{3}'", this.resourceGroupName, this.dataLakeAnalyticsAccountName, this.dataLakeStoreAccountName, AdlaTestsBase.resourceGroupLocation));
5454
}
5555
}
5656
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ namespace Microsoft.Azure.Commands.DataLakeAnalytics.Test.ScenarioTests
3232
using System.Net;
3333
using System.Reflection;
3434

35-
public abstract class DataLakeAnalyticsTestsBase : TestBase, IDisposable
35+
public abstract class AdlaTestsBase : TestBase, IDisposable
3636
{
3737
internal string resourceGroupName { get; set; }
3838
internal string dataLakeAnalyticsAccountName { get; set; }
@@ -51,7 +51,7 @@ public abstract class DataLakeAnalyticsTestsBase : TestBase, IDisposable
5151
private ResourceManagementClient resourceManagementClient;
5252
private StorageManagementClient storageManagementClient;
5353

54-
protected DataLakeAnalyticsTestsBase()
54+
protected AdlaTestsBase()
5555
{
5656
helper = new EnvironmentSetupHelper();
5757
dataLakeAnalyticsManagementClient = GetDataLakeAnalyticsManagementClient();

0 commit comments

Comments
 (0)