upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-14 19:20:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Deduplicate data provider and fix method visibility

Browse source
This commit is contained in:
Joas Schilling 2015-04-24 13:06:27 +02:00
parent 1592be117a
commit 781cfff221
2 changed files with 15 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/lib/encryption/updatetest.php
View file

@ -52,7 +52,7 @@ class UpdateTest extends TestCase {
/** @var \OC\Encryption\File | \PHPUnit_Framework_MockObject_MockObject */
private $fileHelper;
public function setUp() {
protected function setUp() {
parent::setUp();
$this->view = $this->getMockBuilder('\OC\Files\View')

32
tests/lib/files/storage/wrapper/encryption.php
View file

@ -44,7 +44,7 @@ class Encryption extends \Test\Files\Storage\Storage {
*/
private $update;
public function setUp() {
protected function setUp() {
parent::setUp();
@ -127,7 +127,7 @@ class Encryption extends \Test\Files\Storage\Storage {
}
/**
* @dataProvider dataTestRename
* @dataProvider dataTestCopyAndRename
*
* @param string $source
* @param string $target
@ -154,25 +154,13 @@ class Encryption extends \Test\Files\Storage\Storage {
}
/**
* data provider for testRename()
*
* @return array
*/
public function dataTestRename() {
return array(
array('source', 'target', false),
array('source', '/subFolder/target', true),
);
}
/**
* @dataProvider dataTestCopy
* @dataProvider dataTestCopyAndRename
*
* @param string $source
* @param string $target
* @param boolean $shouldUpdate
*/
public function testCopy($source, $target, $shouldUpdate) {
public function testCopyTesting($source, $target, $shouldUpdate) {
$this->keyStore
->expects($this->once())
->method('copyKeys')
@ -193,12 +181,20 @@ class Encryption extends \Test\Files\Storage\Storage {
}
/**
* data provider for testRename()
* @dataProvider copyAndMoveProvider
*/
public function testCopy($source, $target) {
$this->assertTrue(true, 'Replaced by testCopyTesting()');
}
/**
* data provider for testCopyTesting() and dataTestCopyAndRename()
*
* @return array
*/
public function dataTestCopy() {
public function dataTestCopyAndRename() {
return array(
array('source', 'target', false),
array('source', 'target', false),
array('source', '/subFolder/target', true),
);