]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4066f04)
Fix getMock Command/Intergrity
authorRoeland Jago Douma <roeland@famdouma.nl>
Wed, 7 Sep 2016 17:42:23 +0000 (19:42 +0200)
committerRoeland Jago Douma <roeland@famdouma.nl>
Wed, 7 Sep 2016 18:42:37 +0000 (20:42 +0200)
tests/lib/Command/Integrity/SignAppTest.php patch | blob | history
tests/lib/Command/Integrity/SignCoreTest.php patch | blob | history

diff --git a/tests/lib/Command/Integrity/SignAppTest.php b/tests/lib/Command/Integrity/SignAppTest.php
index 44a644c45dfb951bcbe1560fb2815221bcc235b1..71d9946ee889f5a97cc4dcb4357303abb5aed0fa 100644 (file)
--- a/tests/lib/Command/Integrity/SignAppTest.php
+++ b/tests/lib/Command/Integrity/SignAppTest.php
@@ -24,6 +24,8 @@ use OC\Core\Command\Integrity\SignApp;
 use OC\IntegrityCheck\Checker;
 use OC\IntegrityCheck\Helpers\FileAccessHelper;
 use OCP\IURLGenerator;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
 use Test\TestCase;
 
 class SignAppTest extends TestCase {
@@ -38,12 +40,9 @@ class SignAppTest extends TestCase {
 
        public function setUp() {
                parent::setUp();
-               $this->checker = $this->getMockBuilder('\OC\IntegrityCheck\Checker')
-                       ->disableOriginalConstructor()->getMock();
-               $this->fileAccessHelper = $this->getMockBuilder('\OC\IntegrityCheck\Helpers\FileAccessHelper')
-                       ->disableOriginalConstructor()->getMock();
-               $this->urlGenerator = $this->getMockBuilder('\OCP\IURLGenerator')
-                               ->disableOriginalConstructor()->getMock();
+               $this->checker = $this->createMock(Checker::class);
+               $this->fileAccessHelper = $this->createMock(FileAccessHelper::class);
+               $this->urlGenerator = $this->createMock(IURLGenerator::class);
                $this->signApp = new SignApp(
                        $this->checker,
                        $this->fileAccessHelper,
@@ -52,8 +51,8 @@ class SignAppTest extends TestCase {
        }
 
        public function testExecuteWithMissingPath() {
-               $inputInterface = $this->getMock('\Symfony\Component\Console\Input\InputInterface');
-               $outputInterface = $this->getMock('\Symfony\Component\Console\Output\OutputInterface');
+               $inputInterface = $this->createMock(InputInterface::class);
+               $outputInterface = $this->createMock(OutputInterface::class);
 
                $inputInterface
                        ->expects($this->at(0))
@@ -80,8 +79,8 @@ class SignAppTest extends TestCase {
        }
 
        public function testExecuteWithMissingPrivateKey() {
-               $inputInterface = $this->getMock('\Symfony\Component\Console\Input\InputInterface');
-               $outputInterface = $this->getMock('\Symfony\Component\Console\Output\OutputInterface');
+               $inputInterface = $this->createMock(InputInterface::class);
+               $outputInterface = $this->createMock(OutputInterface::class);
 
                $inputInterface
                        ->expects($this->at(0))
@@ -108,8 +107,8 @@ class SignAppTest extends TestCase {
        }
 
        public function testExecuteWithMissingCertificate() {
-               $inputInterface = $this->getMock('\Symfony\Component\Console\Input\InputInterface');
-               $outputInterface = $this->getMock('\Symfony\Component\Console\Output\OutputInterface');
+               $inputInterface = $this->createMock(InputInterface::class);
+               $outputInterface = $this->createMock(OutputInterface::class);
 
                $inputInterface
                        ->expects($this->at(0))
@@ -136,8 +135,8 @@ class SignAppTest extends TestCase {
        }
 
        public function testExecuteWithNotExistingPrivateKey() {
-               $inputInterface = $this->getMock('\Symfony\Component\Console\Input\InputInterface');
-               $outputInterface = $this->getMock('\Symfony\Component\Console\Output\OutputInterface');
+               $inputInterface = $this->createMock(InputInterface::class);
+               $outputInterface = $this->createMock(OutputInterface::class);
 
                $inputInterface
                        ->expects($this->at(0))
@@ -170,8 +169,8 @@ class SignAppTest extends TestCase {
        }
 
        public function testExecuteWithNotExistingCertificate() {
-               $inputInterface = $this->getMock('\Symfony\Component\Console\Input\InputInterface');
-               $outputInterface = $this->getMock('\Symfony\Component\Console\Output\OutputInterface');
+               $inputInterface = $this->createMock(InputInterface::class);
+               $outputInterface = $this->createMock(OutputInterface::class);
 
                $inputInterface
                        ->expects($this->at(0))
@@ -209,8 +208,8 @@ class SignAppTest extends TestCase {
        }
 
        public function testExecute() {
-               $inputInterface = $this->getMock('\Symfony\Component\Console\Input\InputInterface');
-               $outputInterface = $this->getMock('\Symfony\Component\Console\Output\OutputInterface');
+               $inputInterface = $this->createMock(InputInterface::class);
+               $outputInterface = $this->createMock(OutputInterface::class);
 
                $inputInterface
                        ->expects($this->at(0))
diff --git a/tests/lib/Command/Integrity/SignCoreTest.php b/tests/lib/Command/Integrity/SignCoreTest.php
index ff1f6b23a95ba248a8395cf6f2b5a9db20418c61..f3c242ae9fb5fd30f76ab04f400cb39fd7ac028a 100644 (file)
--- a/tests/lib/Command/Integrity/SignCoreTest.php
+++ b/tests/lib/Command/Integrity/SignCoreTest.php
@@ -23,6 +23,8 @@ namespace Test\Command\Integrity;
 use OC\Core\Command\Integrity\SignCore;
 use OC\IntegrityCheck\Checker;
 use OC\IntegrityCheck\Helpers\FileAccessHelper;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
 use Test\TestCase;
 
 class SignCoreTest extends TestCase {
@@ -35,10 +37,8 @@ class SignCoreTest extends TestCase {
 
        public function setUp() {
                parent::setUp();
-               $this->checker = $this->getMockBuilder('\OC\IntegrityCheck\Checker')
-                       ->disableOriginalConstructor()->getMock();
-               $this->fileAccessHelper = $this->getMockBuilder('\OC\IntegrityCheck\Helpers\FileAccessHelper')
-                       ->disableOriginalConstructor()->getMock();
+               $this->checker = $this->createMock(Checker::class);
+               $this->fileAccessHelper = $this->createMock(FileAccessHelper::class);
                $this->signCore = new SignCore(
                        $this->checker,
                        $this->fileAccessHelper
@@ -46,8 +46,8 @@ class SignCoreTest extends TestCase {
        }
 
        public function testExecuteWithMissingPrivateKey() {
-               $inputInterface = $this->getMock('\Symfony\Component\Console\Input\InputInterface');
-               $outputInterface = $this->getMock('\Symfony\Component\Console\Output\OutputInterface');
+               $inputInterface = $this->createMock(InputInterface::class);
+               $outputInterface = $this->createMock(OutputInterface::class);
 
                $inputInterface
                        ->expects($this->at(0))
@@ -69,8 +69,8 @@ class SignCoreTest extends TestCase {
        }
 
        public function testExecuteWithMissingCertificate() {
-               $inputInterface = $this->getMock('\Symfony\Component\Console\Input\InputInterface');
-               $outputInterface = $this->getMock('\Symfony\Component\Console\Output\OutputInterface');
+               $inputInterface = $this->createMock(InputInterface::class);
+               $outputInterface = $this->createMock(OutputInterface::class);
 
                $inputInterface
                        ->expects($this->at(0))
@@ -92,8 +92,8 @@ class SignCoreTest extends TestCase {
        }
 
        public function testExecuteWithNotExistingPrivateKey() {
-               $inputInterface = $this->getMock('\Symfony\Component\Console\Input\InputInterface');
-               $outputInterface = $this->getMock('\Symfony\Component\Console\Output\OutputInterface');
+               $inputInterface = $this->createMock(InputInterface::class);
+               $outputInterface = $this->createMock(OutputInterface::class);
 
                $inputInterface
                        ->expects($this->at(0))
@@ -126,8 +126,8 @@ class SignCoreTest extends TestCase {
        }
 
        public function testExecuteWithNotExistingCertificate() {
-               $inputInterface = $this->getMock('\Symfony\Component\Console\Input\InputInterface');
-               $outputInterface = $this->getMock('\Symfony\Component\Console\Output\OutputInterface');
+               $inputInterface = $this->createMock(InputInterface::class);
+               $outputInterface = $this->createMock(OutputInterface::class);
 
                $inputInterface
                        ->expects($this->at(0))
@@ -165,8 +165,8 @@ class SignCoreTest extends TestCase {
        }
 
        public function testExecute() {
-               $inputInterface = $this->getMock('\Symfony\Component\Console\Input\InputInterface');
-               $outputInterface = $this->getMock('\Symfony\Component\Console\Output\OutputInterface');
+               $inputInterface = $this->createMock(InputInterface::class);
+               $outputInterface = $this->createMock(OutputInterface::class);
 
                $inputInterface
                        ->expects($this->at(0))
Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server