From c4432d6c4b613afdef11dda26bc0ef91c629495a Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Mon, 1 Apr 2019 22:12:41 +0545 Subject: [PATCH] Adjust PHPUnit Framework namespace for PHPUnit6 --- tests/acceptance/features/bootstrap/TextEditorContext.php | 6 +++--- tests/unit/controller/filehandlingcontrollerTest.php | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/acceptance/features/bootstrap/TextEditorContext.php b/tests/acceptance/features/bootstrap/TextEditorContext.php index b9148e75..1924fd52 100644 --- a/tests/acceptance/features/bootstrap/TextEditorContext.php +++ b/tests/acceptance/features/bootstrap/TextEditorContext.php @@ -79,7 +79,7 @@ public function createATextFileWithTheNameUsingTheWebUI( public function nearTheNewTextFileBoxATooltipShouldBeDisplayedOnTheWebUI( $toolTipText ) { - PHPUnit_Framework_Assert::assertEquals( + PHPUnit\Framework\Assert::assertEquals( $toolTipText, $this->textEditorPage->getTooltipOfNewTextFileBox() ); @@ -124,7 +124,7 @@ public function theUserInputsTheFollowingInTheTextArea( * @return void */ public function thereShouldBeLinesOfTextInTheTextArea($number) { - PHPUnit_Framework_Assert::assertEquals( + PHPUnit\Framework\Assert::assertEquals( $number, \count($this->textEditorPage->textFileContent()) ); @@ -141,7 +141,7 @@ public function thereShouldBeLinesOfTextInTheTextArea($number) { public function lineOfTheTextShouldBe($number, $text) { $lineIndex = $number - 1; $textFileContent = $this->textEditorPage->textFileContent(); - PHPUnit_Framework_Assert::assertEquals( + PHPUnit\Framework\Assert::assertEquals( $text, $textFileContent[$lineIndex] ); diff --git a/tests/unit/controller/filehandlingcontrollerTest.php b/tests/unit/controller/filehandlingcontrollerTest.php index 433be2ba..a755db0a 100644 --- a/tests/unit/controller/filehandlingcontrollerTest.php +++ b/tests/unit/controller/filehandlingcontrollerTest.php @@ -35,16 +35,16 @@ class FileHandlingControllerTest extends TestCase { /** @var string */ protected $appName; - /** @var \OCP\IRequest | \PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCP\IRequest | \PHPUnit\Framework\MockObject\MockObject */ protected $requestMock; - /** @var \OCP\IL10N | \PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCP\IL10N | \PHPUnit\Framework\MockObject\MockObject */ private $l10nMock; - /** @var \OCP\ILogger | \PHPUnit_Framework_MockObject_MockObject */ + /** @var \OCP\ILogger | \PHPUnit\Framework\MockObject\MockObject */ private $loggerMock; - /** @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject */ + /** @var \OC\Files\View | \PHPUnit\Framework\MockObject\MockObject */ private $viewMock; public function setUp() {