sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix unit tests

remotes/origin/fix-10825
Bjoern Schiessle 2014-08-27 00:31:49 +07:00
parent 9f7b15582a
commit 72319bbc98
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tests/lib/share/backend.php
Unescape Escape View File

@ -38,19 +38,36 @@ class Test_Share_Backend implements OCP\Share_Backend {
public function generateTarget($itemSource, $shareWith, $exclude = null) {
// Always make target be test.txt to cause conflicts
$target = 'test.txt';
if (isset($exclude)) {
if (substr($itemSource, 0, strlen('test')) !== 'test') {
$target = "test.txt";
} else {
$target = $itemSource;
}
$shares = \OCP\Share::getItemsSharedWithUser('test', $shareWith);
$knownTargets = array();
foreach ($shares as $share) {
$knownTargets[] = $share['item_target'];
}
if (in_array($target, $knownTargets)) {
$pos = strrpos($target, '.');
$name = substr($target, 0, $pos);
$ext = substr($target, $pos);
$append = '';
$i = 1;
while (in_array($name.$append.$ext, $exclude)) {
while (in_array($name.$append.$ext, $knownTargets)) {
$append = $i;
$i++;
}
$target = $name.$append.$ext;
}
return $target;
}

4
tests/lib/share/share.php
Unescape Escape View File

@ -48,8 +48,8 @@ class Test_Share extends PHPUnit_Framework_TestCase {
OC_User::setUserId($this->user1);
OC_Group::clearBackends();
OC_Group::useBackend(new OC_Group_Dummy);
$this->group1 = uniqid('group_');
$this->group2 = uniqid('group_');
$this->group1 = uniqid('group1_');
$this->group2 = uniqid('group2_');
OC_Group::createGroup($this->group1);
OC_Group::createGroup($this->group2);
OC_Group::addToGroup($this->user1, $this->group1);