@@ -316,40 +316,51 @@ function Test-DataLakeStoreFileSystemPermissions
316316 $aceUserId = " 027c28d5-c91d-49f0-98c5-d10134b169b3"
317317
318318 # Set and get all the permissions
319- $result = Get-AdlStoreItemAcl - Account $accountName - path " /"
319+ $result = Get-AdlStoreItemAclEntry - Account $accountName - path " /"
320320 Assert-NotNull $result " Did not get any result from ACL get"
321- Assert-True {$result.UserAces.count -ge 0 } " UserAces is negative or null"
322- $currentCount = $result.UserAces .Count
323-
324- # use the new cmdlet and ensure the count is the same or large than the old count
325- Assert-True {( Get-AdlStoreItemAclEntry - Account $accountName - path " / " ).Count -ge $result .UserAces.Count } " Get-AdlStoreItemAclEntry returned fewer results than Get-AdlStoreItemAcl "
321+ Assert-True {$result.Count -ge 0 } " UserAces is negative or null"
322+ $currentCount = $result.Count
323+ $result .Add ( " user: $aceUserId `:rwx " )
324+ $toRemove = $result [ $result .Count -1 ]
325+ Assert-AreEqual $aceUserId $toRemove .Id
326326
327- $result.UserAces.Add ($aceUserId , " rwx"
328327 Set-AdlStoreItemAcl - Account $accountName - path " /" - Acl $result
329- $result = Get-AdlStoreItemAcl - Account $accountName - path " /"
330- Assert-AreEqual $ ($currentCount + 1 ) $result.UserACes.Count
331- $result.UserAces.Remove ($aceUserId )
328+ $result = Get-AdlStoreItemAclEntry - Account $accountName - path " /"
329+ Assert-AreEqual $ ($currentCount + 1 ) $result.Count
330+ $found = $false
331+ for ($i = 0 ; $i -lt $result.Count ; $i ++ )
332+ {
333+ if ($result [$i ].Id -like $aceUserId )
334+ {
335+ $found = $true
336+ $result.RemoveAt ($i )
337+ break
338+ }
339+ }
340+
341+ Assert-True { $found } " Failed to remove the element: $ ( $toRemove.Entry ) "
342+
332343 # remove the account
333344 Set-AdlStoreItemAcl - Account $accountName - path " /" - Acl $result
334- $result = Get-AdlStoreItemAcl - Account $accountName - path " /"
335- Assert-AreEqual $currentCount $result.UserAces. Count
345+ $result = Get-AdlStoreItemAclEntry - Account $accountName - path " /"
346+ Assert-AreEqual $currentCount $result.Count
336347
337348 # Set and get a specific permission with friendly sets
338349 Set-AdlStoreItemAclEntry - Account $accountName - path " /" - AceType User - Id $aceUserId - Permissions All
339- $result = Get-AdlStoreItemAcl - Account $accountName - path " /"
340- Assert-AreEqual $ ($currentCount + 1 ) $result.UserAces. Count
350+ $result = Get-AdlStoreItemAclEntry - Account $accountName - path " /"
351+ Assert-AreEqual $ ($currentCount + 1 ) $result.Count
341352 # remove a specific permission with friendly remove
342353 Remove-AdlStoreItemAclEntry - Account $accountName - path " /" - AceType User - Id $aceUserId
343- $result = Get-AdlStoreItemAcl - Account $accountName - path " /"
344- Assert-AreEqual $currentCount $result.UserAces. Count
354+ $result = Get-AdlStoreItemAclEntry - Account $accountName - path " /"
355+ Assert-AreEqual $currentCount $result.Count
345356 # set and get a specific permission with the ACE string
346357 Set-AdlStoreItemAclEntry - Account $accountName - path " /" - Acl $ ([string ]::Format(" user:{0}:rwx" , $aceUserId ))
347- $result = Get-AdlStoreItemAcl - Account $accountName - path " /"
348- Assert-AreEqual $ ($currentCount + 1 ) $result.UserAces. Count
358+ $result = Get-AdlStoreItemAclEntry - Account $accountName - path " /"
359+ Assert-AreEqual $ ($currentCount + 1 ) $result.Count
349360 # remove a specific permission with the ACE string
350361 Remove-AdlStoreItemAclEntry - Account $accountName - path " /" - Acl $ ([string ]::Format(" user:{0}:---" , $aceUserId ))
351- $result = Get-AdlStoreItemAcl - Account $accountName - path " /"
352- Assert-AreEqual $currentCount $result.UserAces. Count
362+ $result = Get-AdlStoreItemAclEntry - Account $accountName - path " /"
363+ Assert-AreEqual $currentCount $result.Count
353364
354365 # Validate full ACL removal
355366 Remove-AdlStoreItemAcl - Account $accountName - Path " /" - Force - Default
0 commit comments