From cbe30f740ede9df6ef30a7b65746957ca42996b2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thomas=20M=C3=BCller?= Date: Tue, 14 Apr 2015 12:53:13 +0200 Subject: [PATCH] remove calculateUnencryptedSize() - not needed --- apps/encryption/lib/crypto/encryption.php | 10 ---------- apps/encryption_dummy/lib/dummymodule.php | 10 ---------- lib/public/encryption/iencryptionmodule.php | 8 -------- tests/lib/files/storage/wrapper/encryption.php | 13 +------------ tests/lib/files/stream/encryption.php | 3 +-- 5 files changed, 2 insertions(+), 42 deletions(-) diff --git a/apps/encryption/lib/crypto/encryption.php b/apps/encryption/lib/crypto/encryption.php index 13beda196ce..fd5a84c9734 100644 --- a/apps/encryption/lib/crypto/encryption.php +++ b/apps/encryption/lib/crypto/encryption.php @@ -308,16 +308,6 @@ class Encryption implements IEncryptionModule { return false; } - /** - * calculate unencrypted size - * - * @param string $path to file - * @return integer unencrypted size - */ - public function calculateUnencryptedSize($path) { - // TODO: Implement calculateUnencryptedSize() method. - } - /** * get size of the unencrypted payload per block. * ownCloud read/write files with a block size of 8192 byte diff --git a/apps/encryption_dummy/lib/dummymodule.php b/apps/encryption_dummy/lib/dummymodule.php index b4dfe34a9bf..813b50edcbd 100644 --- a/apps/encryption_dummy/lib/dummymodule.php +++ b/apps/encryption_dummy/lib/dummymodule.php @@ -119,16 +119,6 @@ class DummyModule implements IEncryptionModule { return false; } - /** - * calculate unencrypted size - * - * @param string $path to file - * @return integer unencrypted size - */ - public function calculateUnencryptedSize($path) { - return 42; - } - public function getUnencryptedBlockSize() { return 6126; } diff --git a/lib/public/encryption/iencryptionmodule.php b/lib/public/encryption/iencryptionmodule.php index c1ce7d99d78..d22ca0ec86c 100644 --- a/lib/public/encryption/iencryptionmodule.php +++ b/lib/public/encryption/iencryptionmodule.php @@ -96,14 +96,6 @@ interface IEncryptionModule { */ public function shouldEncrypt($path); - /** - * calculate unencrypted size - * - * @param string $path to file - * @return integer unencrypted size - */ - public function calculateUnencryptedSize($path); - /** * get size of the unencrypted payload per block. * ownCloud read/write files with a block size of 8192 byte diff --git a/tests/lib/files/storage/wrapper/encryption.php b/tests/lib/files/storage/wrapper/encryption.php index 4f7a9e851c1..ec3770260aa 100644 --- a/tests/lib/files/storage/wrapper/encryption.php +++ b/tests/lib/files/storage/wrapper/encryption.php @@ -74,7 +74,7 @@ class Encryption extends \Test\Files\Storage\Storage { protected function buildMockModule() { $encryptionModule = $this->getMockBuilder('\OCP\Encryption\IEncryptionModule') ->disableOriginalConstructor() - ->setMethods(['getId', 'getDisplayName', 'begin', 'end', 'encrypt', 'decrypt', 'update', 'shouldEncrypt', 'calculateUnencryptedSize', 'getUnencryptedBlockSize']) + ->setMethods(['getId', 'getDisplayName', 'begin', 'end', 'encrypt', 'decrypt', 'update', 'shouldEncrypt', 'getUnencryptedBlockSize']) ->getMock(); $encryptionModule->expects($this->any())->method('getId')->willReturn('UNIT_TEST_MODULE'); @@ -85,20 +85,9 @@ class Encryption extends \Test\Files\Storage\Storage { $encryptionModule->expects($this->any())->method('decrypt')->willReturnArgument(0); $encryptionModule->expects($this->any())->method('update')->willReturn(true); $encryptionModule->expects($this->any())->method('shouldEncrypt')->willReturn(true); - $encryptionModule->expects($this->any())->method('calculateUnencryptedSize')->willReturn(42); $encryptionModule->expects($this->any())->method('getUnencryptedBlockSize')->willReturn(8192); return $encryptionModule; } - -// public function testMkDirRooted() { -// $this->instance->mkdir('bar'); -// $this->assertTrue($this->sourceStorage->is_dir('foo/bar')); -// } -// -// public function testFilePutContentsRooted() { -// $this->instance->file_put_contents('bar', 'asd'); -// $this->assertEquals('asd', $this->sourceStorage->file_get_contents('foo/bar')); -// } } // diff --git a/tests/lib/files/stream/encryption.php b/tests/lib/files/stream/encryption.php index 53727a2213d..6964d203f18 100644 --- a/tests/lib/files/stream/encryption.php +++ b/tests/lib/files/stream/encryption.php @@ -88,7 +88,7 @@ class Encryption extends \Test\TestCase { protected function buildMockModule() { $encryptionModule = $this->getMockBuilder('\OCP\Encryption\IEncryptionModule') ->disableOriginalConstructor() - ->setMethods(['getId', 'getDisplayName', 'begin', 'end', 'encrypt', 'decrypt', 'update', 'shouldEncrypt', 'calculateUnencryptedSize', 'getUnencryptedBlockSize']) + ->setMethods(['getId', 'getDisplayName', 'begin', 'end', 'encrypt', 'decrypt', 'update', 'shouldEncrypt', 'getUnencryptedBlockSize']) ->getMock(); $encryptionModule->expects($this->any())->method('getId')->willReturn('UNIT_TEST_MODULE'); @@ -99,7 +99,6 @@ class Encryption extends \Test\TestCase { $encryptionModule->expects($this->any())->method('decrypt')->willReturnArgument(0); $encryptionModule->expects($this->any())->method('update')->willReturn(true); $encryptionModule->expects($this->any())->method('shouldEncrypt')->willReturn(true); - $encryptionModule->expects($this->any())->method('calculateUnencryptedSize')->willReturn(42); $encryptionModule->expects($this->any())->method('getUnencryptedBlockSize')->willReturn(8192); return $encryptionModule; } -- 2.39.5