Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
our_own_cloud_project
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
die_coolen_jungs
our_own_cloud_project
Commits
97b5989e
Commit
97b5989e
authored
Mar 31, 2017
by
Vincent Petry
Committed by
GitHub
Mar 31, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #27541 from owncloud/fix-external-service-sort-stability
Fix GlobalStoragesServiceTest comparing arrays
parents
9c242d8d
1f0b3b59
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
5 deletions
+13
-5
tests/lib/Files/External/Service/GlobalStoragesServiceTest.php
.../lib/Files/External/Service/GlobalStoragesServiceTest.php
+13
-5
No files found.
tests/lib/Files/External/Service/GlobalStoragesServiceTest.php
View file @
97b5989e
...
...
@@ -129,6 +129,14 @@ class GlobalStoragesServiceTest extends StoragesServiceTest {
];
}
private
function
assertEqualsArrays
(
$expected
,
$actual
)
{
sort
(
$expected
);
sort
(
$actual
);
$this
->
assertEquals
(
$expected
,
$actual
);
}
/**
* @dataProvider storageDataProvider
*/
...
...
@@ -143,9 +151,9 @@ class GlobalStoragesServiceTest extends StoragesServiceTest {
$this
->
assertEquals
(
$storage
->
getMountPoint
(),
$newStorage
->
getMountPoint
());
$this
->
assertEquals
(
$storage
->
getBackend
(),
$newStorage
->
getBackend
());
$this
->
assertEquals
(
$storage
->
getAuthMechanism
(),
$newStorage
->
getAuthMechanism
());
$this
->
assertEquals
(
$storage
->
getBackendOptions
(),
$newStorage
->
getBackendOptions
());
$this
->
assertEquals
(
$storage
->
getApplicableUsers
(),
$newStorage
->
getApplicableUsers
());
$this
->
assertEquals
(
$storage
->
getApplicableGroups
(),
$newStorage
->
getApplicableGroups
());
$this
->
assertEquals
Arrays
(
$storage
->
getBackendOptions
(),
$newStorage
->
getBackendOptions
());
$this
->
assertEquals
Arrays
(
$storage
->
getApplicableUsers
(),
$newStorage
->
getApplicableUsers
());
$this
->
assertEquals
Arrays
(
$storage
->
getApplicableGroups
(),
$newStorage
->
getApplicableGroups
());
$this
->
assertEquals
(
$storage
->
getPriority
(),
$newStorage
->
getPriority
());
$this
->
assertEquals
(
0
,
$newStorage
->
getStatus
());
...
...
@@ -182,8 +190,8 @@ class GlobalStoragesServiceTest extends StoragesServiceTest {
$this
->
assertEquals
(
$updatedStorage
->
getMountPoint
(),
$newStorage
->
getMountPoint
());
$this
->
assertEquals
(
$updatedStorage
->
getBackendOptions
()[
'password'
],
$newStorage
->
getBackendOptions
()[
'password'
]);
$this
->
assertEquals
(
$updatedStorage
->
getApplicableUsers
(),
$newStorage
->
getApplicableUsers
());
$this
->
assertEquals
(
$updatedStorage
->
getApplicableGroups
(),
$newStorage
->
getApplicableGroups
());
$this
->
assertEquals
Arrays
(
$updatedStorage
->
getApplicableUsers
(),
$newStorage
->
getApplicableUsers
());
$this
->
assertEquals
Arrays
(
$updatedStorage
->
getApplicableGroups
(),
$newStorage
->
getApplicableGroups
());
$this
->
assertEquals
(
$updatedStorage
->
getPriority
(),
$newStorage
->
getPriority
());
$this
->
assertEquals
(
0
,
$newStorage
->
getStatus
());
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment