Skip to content

Commit 5082c8d

Browse files
rahuldutta90rahuldutta90
committed
Add unittests for new apis
1 parent b8f51ec commit 5082c8d

File tree

5 files changed

+103
-8
lines changed

5 files changed

+103
-8
lines changed

‎src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/ScenarioTests/AdlsAliasTests.ps1

Lines changed: 49 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,10 @@ function Test-DataLakeStoreFileSystem
416416
$movefolder = "/adlspstestmovefolder"
417417
$importFile = "$folderToCreate/importfile.txt"
418418
$content = "Test file content! @ Azure PsTest01?"
419-
419+
$summaryFolder="/adlspstestsummaryfolder"
420+
$subFolderToCreate = "$summaryFolder/Folder0"
421+
$subSubFolderToCreate = "$summaryFolder/Folder0/SubFolder0"
422+
$subFileToCreate = "$summaryFolder/File0"
420423

421424
# Create and get Empty folder
422425
$result = New-AdlStoreItem -Account $accountName -path $folderToCreate -Folder
@@ -546,14 +549,35 @@ function Test-DataLakeStoreFileSystem
546549
Assert-AreEqual 0 $result.Length
547550
Assert-Throws {Get-AdlStoreItem -Account $accountName -path $folderToCreate}
548551

552+
# getcontentsummary
553+
$result = New-AdlStoreItem -Account $accountName -path $summaryFolder -Folder
554+
Assert-NotNull $result "No value was returned on folder creation"
555+
$result = New-AdlStoreItem -Account $accountName -path $subFolderToCreate -Folder
556+
Assert-NotNull $result "No value was returned on folder creation"
557+
$result = New-AdlStoreItem -Account $accountName -path $subSubFolderToCreate -Folder
558+
Assert-NotNull $result "No value was returned on folder creation"
559+
New-AdlStoreItem -Account $accountName -Path $subFileToCreate -Force -Value $content
560+
$result = Get-AdlStoreChildItemSummary -Account $accountName -Path $summaryFolder
561+
Assert-AreEqual $result.Length $content.Length
562+
# Files will be the test file and the above moved file
563+
Assert-AreEqual $result.FileCount 1
564+
565+
# Export DiskUsage
566+
Export-AdlStoreChildItemProperties -Account $accountName -Path $summaryFolder -OutputPath $targetFile -GetDiskUsage -IncludeFile
567+
$result = Get-ChildItem $targetFile
568+
Assert-NotNull $result "Target file was not created"
569+
Remove-Item -path $targetFile -force -confirm:$false
570+
549571
# delete a file
550572
Assert-True {Remove-AdlStoreItem -Account $accountName -paths "$moveFolder/movefile.txt" -force -passthru } "Remove File Failed"
551573
Assert-Throws {Get-AdlStoreItem -Account $accountName -path $moveFile}
552574

553575
# delete a folder
554576
Assert-True {Remove-AdlStoreItem -Account $accountName -paths $moveFolder -force -recurse -passthru} "Remove folder failed"
555577
Assert-Throws {Get-AdlStoreItem -Account $accountName -path $moveFolder}
556-
578+
Assert-True {Remove-AdlStoreItem -Account $accountName -paths $summaryFolder -force -recurse -passthru} "Remove folder failed"
579+
Assert-Throws {Get-AdlStoreItem -Account $accountName -path $summaryFolder}
580+
557581
# Delete Data Lake account
558582
Assert-True {Remove-AdlStore -ResourceGroupName $resourceGroupName -Name $accountName -Force -PassThru} "Remove Account failed."
559583

@@ -609,6 +633,9 @@ function Test-DataLakeStoreFileSystemPermissions
609633
[Microsoft.WindowsAzure.Commands.Utilities.Common.TestMockSupport]::Delay(30000)
610634
Assert-False {$i -eq 60} " Data Lake Store account is not in succeeded state even after 30 min."
611635
}
636+
637+
#define folder name to create for recursive Acl
638+
$folderToCreate = "/aclRecurseFolder"
612639

613640
# define the permissions to add/remove
614641
$aceUserId = "027c28d5-c91d-49f0-98c5-d10134b169b3"
@@ -674,6 +701,26 @@ function Test-DataLakeStoreFileSystemPermissions
674701
$result = Get-AdlStoreItemAclEntry -Account $accountName -path "/"
675702
Assert-AreEqual $($currentCount) $result.Count
676703

704+
# Create file/folder for recursive Acl
705+
$result = New-AdlStoreItem -Account $accountName -path $folderToCreate -Folder
706+
Assert-NotNull $result "No value was returned on folder creation"
707+
708+
#Recursive Acl Modify
709+
Set-AdlStoreItemAclEntry -Account $accountName -path "/" -AceType User -Permissions All -Id $aceUserId -Recurse
710+
$result = Get-AzureRMDataLakeStoreItemAclEntry -Account $accountName -path "/"
711+
Assert-AreEqual $($currentCount+1) $result.Count
712+
713+
# Export Acl
714+
$targetFile = "/aclOutputFile"
715+
Export-AdlStoreChildItemProperties -Account $accountName -Path "/" -OutputPath $targetFile -GetAcl -IncludeFile -SaveToAdl
716+
$result = Get-AzureRMDataLakeStoreItem -Account $accountName -path $targetFile
717+
Assert-NotNull $result "No file was created on export properties"
718+
719+
#Recursive Acl remove
720+
Remove-AdlStoreItemAclEntry -Account $accountName -path "/" -AceType User -Id $aceUserId -Recurse
721+
$result = Get-AzureRMDataLakeStoreItemAclEntry -Account $accountName -path "/"
722+
Assert-AreEqual $($currentCount) $result.Count
723+
677724
# Validate full ACL removal
678725
Remove-AdlStoreItemAcl -Account $accountName -Path "/" -Force -Default
679726
$result = Get-AdlStoreItemAclEntry -Account $accountName -path "/"

‎src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/ScenarioTests/AdlsTests.ps1

Lines changed: 49 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,10 @@ function Test-DataLakeStoreFileSystem
415415
$movefolder = "/adlspstestmovefolder"
416416
$importFile = "$folderToCreate/importfile.txt"
417417
$content = "Test file content! @ Azure PsTest01?"
418-
418+
$summaryFolder="/adlspstestsummaryfolder"
419+
$subFolderToCreate = "$summaryFolder/Folder0"
420+
$subSubFolderToCreate = "$summaryFolder/Folder0/SubFolder0"
421+
$subFileToCreate = "$summaryFolder/File0"
419422

420423
# Create and get Empty folder
421424
$result = New-AzureRMDataLakeStoreItem -Account $accountName -path $folderToCreate -Folder
@@ -544,14 +547,35 @@ function Test-DataLakeStoreFileSystem
544547
Assert-AreEqual "Directory" $result.Type
545548
Assert-AreEqual 0 $result.Length
546549
Assert-Throws {Get-AzureRMDataLakeStoreItem -Account $accountName -path $folderToCreate}
547-
550+
551+
# getcontentsummary
552+
$result = New-AzureRMDataLakeStoreItem -Account $accountName -path $summaryFolder -Folder
553+
Assert-NotNull $result "No value was returned on folder creation"
554+
$result = New-AzureRMDataLakeStoreItem -Account $accountName -path $subFolderToCreate -Folder
555+
Assert-NotNull $result "No value was returned on folder creation"
556+
$result = New-AzureRMDataLakeStoreItem -Account $accountName -path $subSubFolderToCreate -Folder
557+
Assert-NotNull $result "No value was returned on folder creation"
558+
New-AzureRMDataLakeStoreItem -Account $accountName -Path $subFileToCreate -Force -Value $content
559+
$result = Get-AzureRmDataLakeStoreChildItemSummary -Account $accountName -Path $summaryFolder
560+
Assert-AreEqual $result.Length $content.Length
561+
# Files will be the test file and the above moved file
562+
Assert-AreEqual $result.FileCount 1
563+
564+
# Export DiskUsage
565+
Export-AzureRmDataLakeStoreChildItemProperties -Account $accountName -Path $summaryFolder -OutputPath $targetFile -GetDiskUsage -IncludeFile
566+
$result = Get-ChildItem $targetFile
567+
Assert-NotNull $result "Target file was not created"
568+
Remove-Item -path $targetFile -force -confirm:$false
569+
548570
# delete a file
549571
Assert-True {Remove-AzureRMDataLakeStoreItem -Account $accountName -paths "$moveFolder/movefile.txt" -force -passthru } "Remove File Failed"
550572
Assert-Throws {Get-AzureRMDataLakeStoreItem -Account $accountName -path $moveFile}
551573

552574
# delete a folder
553575
Assert-True {Remove-AzureRMDataLakeStoreItem -Account $accountName -paths $moveFolder -force -recurse -passthru} "Remove folder failed"
554576
Assert-Throws {Get-AzureRMDataLakeStoreItem -Account $accountName -path $moveFolder}
577+
Assert-True {Remove-AzureRMDataLakeStoreItem -Account $accountName -paths $summaryFolder -force -recurse -passthru} "Remove folder failed"
578+
Assert-Throws {Get-AzureRMDataLakeStoreItem -Account $accountName -path $summaryFolder}
555579

556580
# Delete Data Lake account
557581
Assert-True {Remove-AzureRMDataLakeStoreAccount -ResourceGroupName $resourceGroupName -Name $accountName -Force -PassThru} "Remove Account failed."
@@ -609,6 +633,9 @@ function Test-DataLakeStoreFileSystemPermissions
609633
Assert-False {$i -eq 60} " Data Lake Store account is not in succeeded state even after 30 min."
610634
}
611635

636+
#define folder name to create for recursive Acl
637+
$folderToCreate = "/aclRecurseFolder"
638+
612639
# define the permissions to add/remove
613640
$aceUserId = "027c28d5-c91d-49f0-98c5-d10134b169b3"
614641

@@ -675,6 +702,26 @@ function Test-DataLakeStoreFileSystemPermissions
675702
$result = Get-AzureRMDataLakeStoreItemAclEntry -Account $accountName -path "/"
676703
Assert-AreEqual $($currentCount) $result.Count
677704

705+
# Create file/folder for recursive Acl
706+
$result = New-AzureRMDataLakeStoreItem -Account $accountName -path $folderToCreate -Folder
707+
Assert-NotNull $result "No value was returned on folder creation"
708+
709+
#Recursive Acl Modify
710+
Set-AzureRMDataLakeStoreItemAclEntry -Account $accountName -path "/" -AceType User -Permissions All -Id $aceUserId -Recurse
711+
$result = Get-AzureRMDataLakeStoreItemAclEntry -Account $accountName -path "/"
712+
Assert-AreEqual $($currentCount+1) $result.Count
713+
714+
# Export Acl
715+
$targetFile = "/aclOutputFile"
716+
Export-AzureRmDataLakeStoreChildItemProperties -Account $accountName -Path "/" -OutputPath $targetFile -GetAcl -IncludeFile -SaveToAdl
717+
$result = Get-AzureRMDataLakeStoreItem -Account $accountName -path $targetFile
718+
Assert-NotNull $result "No file was created on export properties"
719+
720+
#Recursive Acl remove
721+
Remove-AzureRMDataLakeStoreItemAclEntry -Account $accountName -path "/" -AceType User -Id $aceUserId -Recurse
722+
$result = Get-AzureRMDataLakeStoreItemAclEntry -Account $accountName -path "/"
723+
Assert-AreEqual $($currentCount) $result.Count
724+
678725
# Validate full ACL removal
679726
Remove-AzureRMDataLakeStoreItemAcl -Account $accountName -Path "/" -Force -Default
680727
$result = Get-AzureRMDataLakeStoreItemAclEntry -Account $accountName -path "/"

‎src/ResourceManager/DataLakeStore/Commands.DataLakeStore/Commands.DataLakeStore.Netcore.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,10 @@
2828
</PropertyGroup>
2929

3030
<ItemGroup>
31-
<PackageReference Include="Microsoft.Azure.DataLake.Store" Version="1.1.4" />
31+
<PackageReference Include="Microsoft.Azure.DataLake.Store" Version="1.1.6" />
3232
<PackageReference Include="Microsoft.Azure.Management.DataLake.Store" Version="2.3.0-preview" />
33-
<PackageReference Include="NLog" Version="5.0.0-beta09" />
33+
<PackageReference Include="NLog" Version="4.5.0" />
34+
<PackageReference Include="System.Net.Requests" Version="4.3.0" />
3435
</ItemGroup>
3536

3637
<ItemGroup>

‎src/ResourceManager/DataLakeStore/Commands.DataLakeStore/Commands.DataLakeStore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<ItemGroup>
3939
<Reference Include="Microsoft.Azure.DataLake.Store, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
4040
<SpecificVersion>False</SpecificVersion>
41-
<HintPath>..\..\..\packages\Microsoft.Azure.DataLake.Store.1.1.4\lib\net452\Microsoft.Azure.DataLake.Store.dll</HintPath>
41+
<HintPath>..\..\..\packages\Microsoft.Azure.DataLake.Store.1.1.6\lib\net452\Microsoft.Azure.DataLake.Store.dll</HintPath>
4242
<Private>True</Private>
4343
</Reference>
4444
<Reference Include="Microsoft.Azure.Management.DataLake.Store, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

‎src/ResourceManager/DataLakeStore/Commands.DataLakeStore/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Azure.DataLake.Store" version="1.1.4" targetFramework="net452" />
3+
<package id="Microsoft.Azure.DataLake.Store" version="1.1.6" targetFramework="net452" />
44
<package id="Microsoft.Azure.Management.DataLake.Store" version="2.3.0-preview" targetFramework="net452" />
55
<package id="NLog" version="4.4.12" targetFramework="net452" />
66
</packages>

0 commit comments

Comments
 (0)