diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-04-14 12:53:13 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-04-14 13:08:59 +0200 |
| commit | cbe30f740ede9df6ef30a7b65746957ca42996b2 (patch) | |
| tree | 18d903ae02a8d1266e64d91d7e24eef8153249d2 /tests | |
| parent | 967e882757bdaf2f9703884f65dcd3c88530422c (diff) | |
| download | nextcloud-server-cbe30f740ede9df6ef30a7b65746957ca42996b2.tar.gz nextcloud-server-cbe30f740ede9df6ef30a7b65746957ca42996b2.zip | |
remove calculateUnencryptedSize() - not needed
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lib/files/storage/wrapper/encryption.php | 13 | ||||
| -rw-r--r-- | tests/lib/files/stream/encryption.php | 3 |
2 files changed, 2 insertions, 14 deletions
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; } |