Merge pull request #26275 from nextcloud/backport/26265/stable20

[stable20] Fix casing of core test folder, bring back missing tests

Author: MorrisJobke

tests/Core/Command/Preview/RepairTest.php

@@ -9,6 +9,7 @@
 use OCP\Files\Node;
 use OCP\IConfig;
 use OCP\ILogger;
+use OCP\Lock\ILockingProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use Symfony\Component\Console\Formatter\OutputFormatterInterface;
 use Symfony\Component\Console\Input\InputInterface;
@@ -43,7 +44,13 @@ protected function setUp(): void {
 			->getMock();
 		$this->iniGetWrapper = $this->getMockBuilder(IniGetWrapper::class)
 			->getMock();
-		$this->repair = new Repair($this->config, $this->rootFolder, $this->logger, $this->iniGetWrapper);
+		$this->repair = new Repair(
+			$this->config,
+			$this->rootFolder,
+			$this->logger,
+			$this->iniGetWrapper,
+			$this->createMock(ILockingProvider::class)
+		);
 		$this->input = $this->getMockBuilder(InputInterface::class)
 			->getMock();
 		$this->input->expects($this->any())

tests/Core/Controller/LoginControllerTest.php

@@ -440,6 +440,7 @@ public function testLoginWithInvalidCredentials() {
 			->with('core.login.showLoginForm', [
 				'user' => $user,
 				'redirect_url' => '/apps/files',
+				'direct' => 1,
 			])
 			->willReturn($loginPageUrl);
 		$expected = new \OCP\AppFramework\Http\RedirectResponse($loginPageUrl);
@@ -597,6 +598,7 @@ public function testToNotLeakLoginName() {
 			->with('core.login.showLoginForm', [
 				'user' => '[email protected]',
 				'redirect_url' => '/apps/files',
+				'direct' => 1,
 			])
 			->willReturn($loginPageUrl);
 		$expected = new \OCP\AppFramework\Http\RedirectResponse($loginPageUrl);

tests/Test/Repair/Owncloud/CleanPreviewsBackgroundJobTest.php

@@ -52,7 +52,7 @@ class CleanPreviewsBackgroundJobTest extends TestCase {
 	/** @var  IUserManager|\PHPUnit_Framework_MockObject_MockObject */
 	private $userManager;
 
-	public function setUp() {
+	public function setUp(): void {
 		parent::setUp();
 
 		$this->rootFolder = $this->createMock(IRootFolder::class);

tests/Test/Repair/Owncloud/CleanPreviewsTest.php

@@ -46,7 +46,7 @@ class CleanPreviewsTest extends TestCase {
 	/** @var CleanPreviews */
 	private $repair;
 
-	public function setUp() {
+	public function setUp(): void {
 		parent::setUp();
 
 		$this->jobList = $this->createMock(IJobList::class);

tests/Test/Repair/Owncloud/InstallCoreBundleTest.php

@@ -41,7 +41,7 @@ class InstallCoreBundleTest extends TestCase {
 	/** @var InstallCoreBundle */
 	private $installCoreBundle;
 
-	public function setUp() {
+	public function setUp(): void {
 		parent::setUp();
 		$this->bundleFetcher = $this->createMock(BundleFetcher::class);
 		$this->config = $this->createMock(IConfig::class);

tests/Test/Repair/Owncloud/UpdateLanguageCodesTest.php

@@ -43,7 +43,7 @@ class UpdateLanguageCodesTest extends TestCase {
 	/** @var IConfig | \PHPUnit_Framework_MockObject_MockObject */
 	private $config;
 
-	protected function setUp() {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->connection = \OC::$server->getDatabaseConnection();
@@ -86,6 +86,7 @@ public function testRun() {
 			->from('preferences')
 			->where($qb->expr()->eq('appid', $qb->createNamedParameter('core')))
 			->andWhere($qb->expr()->eq('configkey', $qb->createNamedParameter('lang')))
+			->orderBy('userid')
 			->execute();
 
 		$rows = $result->fetchAll();

tests/phpunit-autotest.xml

@@ -8,8 +8,8 @@
 >
 	<testsuite name='ownCloud'>
 		<directory suffix='.php'>lib/</directory>
-		<directory suffix='.php'>core/</directory>
-		<directory suffix='.php'>ocs-provider/</directory>
+		<directory suffix='.php'>Core/</directory>
+		<directory suffix='.php'>Test/</directory>
 		<file>apps.php</file>
 	</testsuite>
 	<!-- filters for code coverage -->
@@ -32,4 +32,3 @@
 		<listener class="StartSessionListener" file="startsessionlistener.php" />
 	</listeners>
 </phpunit>
-