Skip to content

Commit 516a1f0

Browse files
markcowlmarkcowl
authored
Merge pull request #2435 from begoldsm/dev
ADL Updates: Defaults and Convenience
2 parents 08393c6 + 08724dd commit 516a1f0

File tree

42 files changed

+46070
-4570
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+46070
-4570
lines changed

‎src/ResourceManager/DataLakeAnalytics/AzureRM.DataLakeAnalytics.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ CmdletsToExport = '*'
7676
VariablesToExport = '*'
7777

7878
# Aliases to export from this module
79-
AliasesToExport = @()
79+
AliasesToExport = '*'
8080

8181
# List of all modules packaged with this module
8282
ModuleList = @()

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,11 @@
7272
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Store.0.12.0-preview\lib\net45\Microsoft.Azure.Management.DataLake.Store.dll</HintPath>
7373
<Private>True</Private>
7474
</Reference>
75+
<Reference Include="Microsoft.Azure.Management.ResourceManager, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
76+
<SpecificVersion>False</SpecificVersion>
77+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.ResourceManager.1.1.1-preview\lib\net45\Microsoft.Azure.Management.ResourceManager.dll</HintPath>
78+
<Private>True</Private>
79+
</Reference>
7580
<Reference Include="Microsoft.Azure.Management.Storage">
7681
<SpecificVersion>False</SpecificVersion>
7782
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.3.0.0\lib\net40\Microsoft.Azure.Management.Storage.dll</HintPath>
@@ -181,6 +186,7 @@
181186
</ItemGroup>
182187
<ItemGroup>
183188
<Compile Include="Properties\AssemblyInfo.cs" />
189+
<Compile Include="ScenarioTests\AdlaAliasTests.cs" />
184190
<Compile Include="ScenarioTests\AdlaTestsBase.cs" />
185191
<Compile Include="ScenarioTests\AdlaTests.cs" />
186192
</ItemGroup>
@@ -203,12 +209,30 @@
203209
<None Include="packages.config">
204210
<SubType>Designer</SubType>
205211
</None>
212+
<None Include="ScenarioTests\AdlaAliasTests.ps1">
213+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
214+
</None>
206215
<None Include="ScenarioTests\Common.ps1">
207216
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
208217
</None>
209218
<None Include="ScenarioTests\AdlaTests.ps1">
210219
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
211220
</None>
221+
<None Include="SessionRecords\Microsoft.Azure.Commands.DataLakeAnalytics.Test.ScenarioTests.AdlaAliasTests\TestAdlaAccount.json">
222+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
223+
</None>
224+
<None Include="SessionRecords\Microsoft.Azure.Commands.DataLakeAnalytics.Test.ScenarioTests.AdlaAliasTests\TestAdlaCatalog.json">
225+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
226+
</None>
227+
<None Include="SessionRecords\Microsoft.Azure.Commands.DataLakeAnalytics.Test.ScenarioTests.AdlaAliasTests\TestAdlaJob.json">
228+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
229+
</None>
230+
<None Include="SessionRecords\Microsoft.Azure.Commands.DataLakeAnalytics.Test.ScenarioTests.AdlaAliasTests\TestNegativeAdlaAccount.json">
231+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
232+
</None>
233+
<None Include="SessionRecords\Microsoft.Azure.Commands.DataLakeAnalytics.Test.ScenarioTests.AdlaAliasTests\TestNegativeAdlaJob.json">
234+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
235+
</None>
212236
<None Include="SessionRecords\Microsoft.Azure.Commands.DataLakeAnalytics.Test.ScenarioTests.AdlaTests\TestAdlaAccount.json">
213237
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
214238
</None>

‎src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics.Test/ScenarioTests/AdlaAliasTests.cs

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
// ----------------------------------------------------------------------------------
2+
//
3+
// Copyright Microsoft Corporation
4+
// Licensed under the Apache License, Version 2.0 (the "License");
5+
// you may not use this file except in compliance with the License.
6+
// You may obtain a copy of the License at
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
// Unless required by applicable law or agreed to in writing, software
9+
// distributed under the License is distributed on an "AS IS" BASIS,
10+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
// See the License for the specific language governing permissions and
12+
// limitations under the License.
13+
// ----------------------------------------------------------------------------------
14+
15+
namespace Microsoft.Azure.Commands.DataLakeAnalytics.Test.ScenarioTests
16+
{
17+
using Microsoft.WindowsAzure.Commands.ScenarioTest;
18+
using Xunit;
19+
20+
public class AdlaAliasTests : AdlaTestsBase
21+
{
22+
public AdlaAliasTests(Xunit.Abstractions.ITestOutputHelper output)
23+
{
24+
ServiceManagemenet.Common.Models.XunitTracingInterceptor.AddToContext(new ServiceManagemenet.Common.Models.XunitTracingInterceptor(output));
25+
}
26+
27+
[Fact]
28+
[Trait(Category.AcceptanceType, Category.CheckIn)]
29+
public void TestAdlaAccount()
30+
{
31+
AdlaTestsBase.NewInstance.RunPsTest(true,
32+
string.Format(
33+
"Test-DataLakeAnalyticsAccount -blobAccountKey -location '{0}'",
34+
AdlaTestsBase.resourceGroupLocation));
35+
}
36+
37+
[Fact]
38+
[Trait(Category.AcceptanceType, Category.CheckIn)]
39+
public void TestAdlaCatalog()
40+
{
41+
AdlaTestsBase.NewInstance.RunPsTest(false,
42+
string.Format(
43+
"Test-DataLakeAnalyticsCatalog -location '{0}'",
44+
AdlaTestsBase.resourceGroupLocation));
45+
}
46+
47+
[Fact]
48+
[Trait(Category.AcceptanceType, Category.CheckIn)]
49+
public void TestAdlaJob()
50+
{
51+
AdlaTestsBase.NewInstance.RunPsTest(false,
52+
string.Format(
53+
"Test-DataLakeAnalyticsJob -location '{0}'",
54+
AdlaTestsBase.resourceGroupLocation));
55+
}
56+
57+
[Fact]
58+
[Trait(Category.AcceptanceType, Category.CheckIn)]
59+
public void TestNegativeAdlaAccount()
60+
{
61+
AdlaTestsBase.NewInstance.RunPsTest(false,
62+
string.Format(
63+
"Test-NegativeDataLakeAnalyticsAccount -location '{0}'",
64+
AdlaTestsBase.resourceGroupLocation));
65+
}
66+
67+
[Fact]
68+
[Trait(Category.AcceptanceType, Category.CheckIn)]
69+
public void TestNegativeAdlaJob()
70+
{
71+
AdlaTestsBase.NewInstance.RunPsTest(false,
72+
string.Format(
73+
"Test-NegativeDataLakeAnalyticsJob -location '{0}'",
74+
AdlaTestsBase.resourceGroupLocation));
75+
}
76+
}
77+
}

0 commit comments

Comments
 (0)