Merge pull request #60785 from nextcloud/backport/60742/stable34

[stable34] test: replace checkbox assertions with real assertions or DoesNotPerformAssertions

Author: AndyScherzinger

tests/lib/AppFramework/Middleware/PublicShare/PublicShareMiddlewareTest.php

@@ -53,11 +53,11 @@ protected function setUp(): void {
 		);
 	}
 
+	#[\PHPUnit\Framework\Attributes\DoesNotPerformAssertions]
 	public function testBeforeControllerNoPublicShareController(): void {
 		$controller = $this->createMock(Controller::class);
 
 		$this->middleware->beforeController($controller, 'method');
-		$this->assertTrue(true);
 	}
 
 	public static function dataShareApi(): array {
@@ -157,14 +157,11 @@ public function testBeforeControllerValidTokenAuthenticateMethod(): void {
 			->with('token', null)
 			->willReturn('myToken');
 
-		$controller->method('isValidToken')
-			->willReturn(true);
-
-		$controller->method('isPasswordProtected')
+		$controller->expects($this->once())
+			->method('isValidToken')
 			->willReturn(true);
 
 		$this->middleware->beforeController($controller, 'authenticate');
-		$this->assertTrue(true);
 	}
 
 	public function testBeforeControllerValidTokenShowAuthenticateMethod(): void {
@@ -182,14 +179,11 @@ public function testBeforeControllerValidTokenShowAuthenticateMethod(): void {
 			->with('token', null)
 			->willReturn('myToken');
 
-		$controller->method('isValidToken')
-			->willReturn(true);
-
-		$controller->method('isPasswordProtected')
+		$controller->expects($this->once())
+			->method('isValidToken')
 			->willReturn(true);
 
 		$this->middleware->beforeController($controller, 'showAuthenticate');
-		$this->assertTrue(true);
 	}
 
 	public function testBeforeControllerAuthPublicShareController(): void {

tests/lib/DB/QueryBuilder/Sharded/SharedQueryBuilderTest.php

@@ -65,24 +65,24 @@ public function testGetPrimaryKeyParam(): void {
 		$this->assertEquals([], $query->getShardKeys());
 	}
 
+	#[\PHPUnit\Framework\Attributes\DoesNotPerformAssertions]
 	public function testValidateWithShardKey(): void {
 		$query = $this->getQueryBuilder('filecache', 'storage', 'fileid');
 		$query->select('fileid', 'path')
 			->from('filecache')
 			->where($query->expr()->eq('storage', $query->createNamedParameter(10)));
 
 		$query->validate();
-		$this->assertTrue(true);
 	}
 
+	#[\PHPUnit\Framework\Attributes\DoesNotPerformAssertions]
 	public function testValidateWithPrimaryKey(): void {
 		$query = $this->getQueryBuilder('filecache', 'storage', 'fileid');
 		$query->select('fileid', 'path')
 			->from('filecache')
 			->where($query->expr()->in('fileid', $query->createNamedParameter([10, 11], IQueryBuilder::PARAM_INT)));
 
 		$query->validate();
-		$this->assertTrue(true);
 	}
 
 	public function testValidateWithNoKey(): void {
@@ -96,14 +96,14 @@ public function testValidateWithNoKey(): void {
 		$this->fail('exception expected');
 	}
 
+	#[\PHPUnit\Framework\Attributes\DoesNotPerformAssertions]
 	public function testValidateNonSharedTable(): void {
 		$query = $this->getQueryBuilder('filecache', 'storage', 'fileid');
 		$query->select('configvalue')
 			->from('appconfig')
 			->where($query->expr()->eq('configkey', $query->createNamedParameter('test')));
 
 		$query->validate();
-		$this->assertTrue(true);
 	}
 
 	public function testGetShardKeyMultipleSingleParam(): void {

tests/lib/Files/SimpleFS/InMemoryFileTest.php

@@ -45,15 +45,9 @@ public function testPutContent(): void {
 		self::assertEquals('test', $this->testPdf->getContent());
 	}
 
-	/**
-	 * Asserts that delete() doesn't rise an exception.
-	 *
-	 * @return void
-	 */
+	#[\PHPUnit\Framework\Attributes\DoesNotPerformAssertions]
 	public function testDelete(): void {
 		$this->testPdf->delete();
-		// assert true, otherwise phpunit complains about not doing any assert
-		self::assertTrue(true);
 	}
 
 	/**

tests/lib/Repair/ClearFrontendCachesTest.php

@@ -48,6 +48,5 @@ public function testRun(): void {
 			->willReturn($imagePathCache);
 
 		$this->repair->run($this->outputMock);
-		$this->assertTrue(true);
 	}
 }

tests/lib/Talk/BrokerTest.php

@@ -103,10 +103,9 @@ public function testHasBackend(): void {
 	}
 
 	public function testNewConversationOptions(): void {
-		$this->broker->newConversationOptions();
+		$options = $this->broker->newConversationOptions();
 
-		// Nothing to assert
-		$this->addToAssertionCount(1);
+		$this->assertInstanceOf(IConversationOptions::class, $options);
 	}
 
 	public function testCreateConversation(): void {