Fix phpunit

Signed-off-by: Joas Schilling <coding@schilljs.com>
nextcloud · Mar 5, 2020 · 4d2924a · 4d2924a
1 parent af3ec18
commit 4d2924a
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 16 deletions.
diff --git a/.gitignore b/.gitignore
@@ -57,6 +57,7 @@ nbproject
 /tests/Unit/coverage*
 /tests/Unit/clover.xml
 /tests/Unit/js/node_modules
+/tests/Unit/.phpunit.result.cache
 
 /tests/Integration/output
 /tests/Integration/vendor

diff --git a/tests/Unit/AppInfo/RoutesTest.php b/tests/Unit/AppInfo/RoutesTest.php
@@ -33,10 +33,10 @@
 class RoutesTest extends TestCase {
 	public function testRoutes() {
 		$routes = include __DIR__ . '/../../../appinfo/routes.php';
-		$this->assertInternalType('array', $routes);
+		$this->assertIsArray($routes);
 		$this->assertCount(1, $routes);
 		$this->assertArrayHasKey('ocs', $routes);
-		$this->assertInternalType('array', $routes['ocs']);
+		$this->assertIsArray($routes['ocs']);
 		$this->assertCount(7, $routes['ocs']);
 	}
 }
diff --git a/tests/Unit/Controller/EndpointControllerTest.php b/tests/Unit/Controller/EndpointControllerTest.php
@@ -440,15 +440,15 @@ public function testDeleteAllNotifications($_, $username) {
 
 	public function dataNotificationToArray() {
 		return [
-			['v1', 42, 'app1', 'user1', 1234, 'type1', 42, 'subject1', '', [], 'message1', 'richMessage 1', ['richMessage param'], 'link1', 'icon1', [], []],
-			['v1', 1337, 'app2', 'user2', 1337, 'type2', 21, 'subject2', 'richSubject 2', ['richSubject param'], 'message2', '', [], 'link2', 'icon2', [
+			['v1', 42, 'app1', 'user1', 1234, 'type1', '42', 'subject1', '', [], 'message1', 'richMessage 1', ['richMessage param'], 'link1', 'icon1', [], []],
+			['v1', 1337, 'app2', 'user2', 1337, 'type2', '21', 'subject2', 'richSubject 2', ['richSubject param'], 'message2', '', [], 'link2', 'icon2', [
 				$this->getMockBuilder(IAction::class)
 					->getMock(),
 				$this->getMockBuilder(IAction::class)
 					->getMock(),
 			], [['action'], ['action']]],
-			['v2', 42, 'app1', 'user1', 1234, 'type1', 42, 'subject1', '', [], 'message1', 'richMessage 1', ['richMessage param'], 'link1', 'icon1', [], []],
-			['v2', 1337, 'app2', 'user2', 1337, 'type2', 21, 'subject2', 'richSubject 2', ['richSubject param'], 'message2', '', [], 'link2', 'icon2', [
+			['v2', 42, 'app1', 'user1', 1234, 'type1', '42', 'subject1', '', [], 'message1', 'richMessage 1', ['richMessage param'], 'link1', 'icon1', [], []],
+			['v2', 1337, 'app2', 'user2', 1337, 'type2', '21', 'subject2', 'richSubject 2', ['richSubject param'], 'message2', '', [], 'link2', 'icon2', [
 				$this->getMockBuilder(IAction::class)
 					->getMock(),
 				$this->getMockBuilder(IAction::class)

diff --git a/tests/Unit/Notifier/NotifierTest.php b/tests/Unit/Notifier/NotifierTest.php
@@ -61,10 +61,6 @@ protected function setUp(): void {
 		);
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 * @expectedExceptionMessage Unknown app
-	 */
 	public function testPrepareWrongApp() {
 		/** @var INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
 		$notification = $this->createMock(INotification::class);
@@ -75,13 +71,11 @@ public function testPrepareWrongApp() {
 		$notification->expects($this->never())
 			->method('getSubject');
 
+		$this->expectException(\InvalidArgumentException::class);
+		$this->expectExceptionMessage('Unknown app');
 		$this->notifier->prepare($notification, 'en');
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 * @expectedExceptionMessage Unknown subject
-	 */
 	public function testPrepareWrongSubject() {
 		/** @var INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
 		$notification = $this->createMock(INotification::class);
@@ -93,6 +87,8 @@ public function testPrepareWrongSubject() {
 			->method('getSubject')
 			->willReturn('wrong subject');
 
+		$this->expectException(\InvalidArgumentException::class);
+		$this->expectExceptionMessage('Unknown subject');
 		$this->notifier->prepare($notification, 'en');
 	}
 

diff --git a/tests/Unit/PushTest.php b/tests/Unit/PushTest.php
@@ -468,7 +468,7 @@ public function testPushToDeviceSending($isDebug) {
 		$response2->expects($this->once())
 			->method('getStatusCode')
 			->willReturn(Http::STATUS_SERVICE_UNAVAILABLE);
-		$response2->expects($isDebug ? $this->once() : $this->never())
+		$response2->expects($this->once())
 			->method('getBody')
 			->willReturn('Maintenance');
 		$client->expects($this->at(2))

diff --git a/tests/Unit/phpunit.xml b/tests/Unit/phpunit.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <phpunit bootstrap="bootstrap.php"
-		 strict="true"
 		 verbose="true"
 		 timeoutForSmallTests="900"
 		 timeoutForMediumTests="900"