Deduplicate data provider and fix method visibility

2 files changed, 15 insertions, 19 deletions

diff --git a/tests/lib/encryption/updatetest.php b/tests/lib/encryption/updatetest.php
index 28bb0031308..08d4125735d 100644
--- a/tests/lib/encryption/updatetest.php
+++ b/tests/lib/encryption/updatetest.php
@@ -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')
diff --git a/tests/lib/files/storage/wrapper/encryption.php b/tests/lib/files/storage/wrapper/encryption.php
index 2d3f10ecdfa..a257ca24a0c 100644
--- a/tests/lib/files/storage/wrapper/encryption.php
+++ b/tests/lib/files/storage/wrapper/encryption.php
@@ -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,13 +181,21 @@ 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),
 		);
 	}