Skip to content

Commit 7c7617e

Browse files
author
begoldsm
committed
Update ADL PowerShell and tests
Using the latest ADL packages and re-running the tests.
1 parent 8abf31d commit 7c7617e

File tree

23 files changed

+3775
-3014
lines changed

23 files changed

+3775
-3014
lines changed

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,12 @@
6464
</Reference>
6565
<Reference Include="Microsoft.Azure.Management.DataLake.Analytics, Version=0.10.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6666
<SpecificVersion>False</SpecificVersion>
67-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Analytics.0.10.1-preview\lib\net45\Microsoft.Azure.Management.DataLake.Analytics.dll</HintPath>
67+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Analytics.0.10.2-preview\lib\net45\Microsoft.Azure.Management.DataLake.Analytics.dll</HintPath>
6868
<Private>True</Private>
6969
</Reference>
7070
<Reference Include="Microsoft.Azure.Management.DataLake.Store, Version=0.10.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7171
<SpecificVersion>False</SpecificVersion>
72-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Store.0.10.0-preview\lib\net45\Microsoft.Azure.Management.DataLake.Store.dll</HintPath>
72+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Store.0.10.1-preview\lib\net45\Microsoft.Azure.Management.DataLake.Store.dll</HintPath>
7373
<Private>True</Private>
7474
</Reference>
7575
<Reference Include="Microsoft.Azure.Management.Storage">
@@ -98,12 +98,13 @@
9898
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.18.206251556\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
9999
</Reference>
100100
<Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
101-
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.2.0.1\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
101+
<SpecificVersion>False</SpecificVersion>
102+
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.2.1.0\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
102103
<Private>True</Private>
103104
</Reference>
104105
<Reference Include="Microsoft.Rest.ClientRuntime.Azure, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
105106
<SpecificVersion>False</SpecificVersion>
106-
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.3.0.2\lib\net45\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
107+
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.3.1.0\lib\net45\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
107108
<Private>True</Private>
108109
</Reference>
109110
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

‎src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics.Test/ScenarioTests/AdlaTests.ps1

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ function Test-DataLakeAnalyticsCatalog
534534
$found = $false
535535
foreach($item in $itemList)
536536
{
537-
if($item.DatabaseName -eq $databaseName)
537+
if($item.Name -eq $databaseName)
538538
{
539539
$found = $true
540540
break
@@ -546,7 +546,7 @@ function Test-DataLakeAnalyticsCatalog
546546
# retrieve the specific DB
547547
$specificItem = Get-AzureRMDataLakeAnalyticsCatalogItem -AccountName $accountName -ItemType Database -Path $databaseName
548548
Assert-NotNull $specificItem "Could not retrieve the db by name"
549-
Assert-AreEqual $databaseName $specificItem.DatabaseName
549+
Assert-AreEqual $databaseName $specificItem.Name
550550

551551
# retrieve the list of tables and ensure the created table is in it
552552
$itemList = Get-AzureRMDataLakeAnalyticsCatalogItem -AccountName $accountName -ItemType Table -Path "$databaseName.dbo"
@@ -557,7 +557,7 @@ function Test-DataLakeAnalyticsCatalog
557557
$found = $false
558558
foreach($item in $itemList)
559559
{
560-
if($item.TableName -eq $tableName)
560+
if($item.Name -eq $tableName)
561561
{
562562
$found = $true
563563
break
@@ -569,7 +569,7 @@ function Test-DataLakeAnalyticsCatalog
569569
# retrieve the specific table
570570
$specificItem = Get-AzureRMDataLakeAnalyticsCatalogItem -AccountName $accountName -ItemType Table -Path "$databaseName.dbo.$tableName"
571571
Assert-NotNull $specificItem "Could not retrieve the table by name"
572-
Assert-AreEqual $tableName $specificItem.TableName
572+
Assert-AreEqual $tableName $specificItem.Name
573573

574574
# retrieve the list of table valued functions and ensure the created tvf is in it
575575
$itemList = Get-AzureRMDataLakeAnalyticsCatalogItem -AccountName $accountName -ItemType TableValuedFunction -Path "$databaseName.dbo"
@@ -580,7 +580,7 @@ function Test-DataLakeAnalyticsCatalog
580580
$found = $false
581581
foreach($item in $itemList)
582582
{
583-
if($item.TvfName -eq $tvfName)
583+
if($item.Name -eq $tvfName)
584584
{
585585
$found = $true
586586
break
@@ -592,7 +592,7 @@ function Test-DataLakeAnalyticsCatalog
592592
# retrieve the specific TVF
593593
$specificItem = Get-AzureRMDataLakeAnalyticsCatalogItem -AccountName $accountName -ItemType TableValuedFunction -Path "$databaseName.dbo.$tvfName"
594594
Assert-NotNull $specificItem "Could not retrieve the TVF by name"
595-
Assert-AreEqual $tvfName $specificItem.TvfName
595+
Assert-AreEqual $tvfName $specificItem.Name
596596

597597
# retrieve the list of procedures and ensure the created procedure is in it
598598
$itemList = Get-AzureRMDataLakeAnalyticsCatalogItem -AccountName $accountName -ItemType Procedure -Path "$databaseName.dbo"
@@ -603,7 +603,7 @@ function Test-DataLakeAnalyticsCatalog
603603
$found = $false
604604
foreach($item in $itemList)
605605
{
606-
if($item.ProcName -eq $procName)
606+
if($item.Name -eq $procName)
607607
{
608608
$found = $true
609609
break
@@ -615,7 +615,7 @@ function Test-DataLakeAnalyticsCatalog
615615
# retrieve the specific procedure
616616
$specificItem = Get-AzureRMDataLakeAnalyticsCatalogItem -AccountName $accountName -ItemType Procedure -Path "$databaseName.dbo.$procName"
617617
Assert-NotNull $specificItem "Could not retrieve the procedure by name"
618-
Assert-AreEqual $procName $specificItem.ProcName
618+
Assert-AreEqual $procName $specificItem.Name
619619

620620
# retrieve the list of views and ensure the created view is in it
621621
$itemList = Get-AzureRMDataLakeAnalyticsCatalogItem -AccountName $accountName -ItemType View -Path "$databaseName.dbo"
@@ -626,7 +626,7 @@ function Test-DataLakeAnalyticsCatalog
626626
$found = $false
627627
foreach($item in $itemList)
628628
{
629-
if($item.ViewName -eq $viewName)
629+
if($item.Name -eq $viewName)
630630
{
631631
$found = $true
632632
break
@@ -638,7 +638,7 @@ function Test-DataLakeAnalyticsCatalog
638638
# retrieve the specific view
639639
$specificItem = Get-AzureRMDataLakeAnalyticsCatalogItem -AccountName $accountName -ItemType View -Path "$databaseName.dbo.$viewName"
640640
Assert-NotNull $specificItem "Could not retrieve the view by name"
641-
Assert-AreEqual $viewName $specificItem.ViewName
641+
Assert-AreEqual $viewName $specificItem.Name
642642

643643
# create the secret
644644
$pw = ConvertTo-SecureString -String $secretPwd -AsPlainText -Force
@@ -674,7 +674,7 @@ function Test-DataLakeAnalyticsCatalog
674674
$found = $false
675675
foreach($item in $itemList)
676676
{
677-
if($item.CredentialName -eq $credentialName)
677+
if($item.Name -eq $credentialName)
678678
{
679679
$found = $true
680680
break
@@ -684,7 +684,7 @@ function Test-DataLakeAnalyticsCatalog
684684
# retrieve the specific credential
685685
$specificItem = Get-AzureRMDataLakeAnalyticsCatalogItem -AccountName $accountName -ItemType Credential -Path "$databaseName.$credentialName"
686686
Assert-NotNull $specificItem "Could not retrieve the credential by name"
687-
Assert-AreEqual $credentialName $specificItem.CredentialName
687+
Assert-AreEqual $credentialName $specificItem.Name
688688

689689
# credential job template
690690
$credentialJobTemplate = @"

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,6 @@ private void TryRegisterSubscriptionForResource(string providerName = "Microsoft
278278
ProviderRegistrationState.Registering != resultAfterRegister.Provider.RegistrationState,
279279
string.Format("Provider registration state was not 'Registered' or 'Registering', instead it was '{0}'", resultAfterRegister.Provider.RegistrationState));
280280
ThrowIfTrue(resultAfterRegister.Provider.ResourceTypes == null || resultAfterRegister.Provider.ResourceTypes.Count == 0, "Provider.ResourceTypes is empty.");
281-
ThrowIfTrue(resultAfterRegister.Provider.ResourceTypes[0].Locations == null || resultAfterRegister.Provider.ResourceTypes[0].Locations.Count == 0, "Provider.ResourceTypes[0].Locations is empty.");
282281
}
283282

284283
private void TryCreateResourceGroup(string resourceGroupName, string location)

0 commit comments

Comments
 (0)