From d1aac16a72c88c745d92a04ea0e3bed2fe51a78b Mon Sep 17 00:00:00 2001
From: Côme Chilliet <come.chilliet@nextcloud.com>
Date: Mon, 15 Jan 2024 10:32:26 +0100
Subject: Fix AppDirsWithDifferentOwnerTest
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
---
 .../tests/Controller/CheckSetupControllerTest.php    | 20 --------------------
 .../SetupChecks/AppDirsWithDifferentOwnerTest.php    | 20 ++++++++++++++++++++
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/apps/settings/tests/Controller/CheckSetupControllerTest.php b/apps/settings/tests/Controller/CheckSetupControllerTest.php
index c02bf66cf87..159e0a9358d 100644
--- a/apps/settings/tests/Controller/CheckSetupControllerTest.php
+++ b/apps/settings/tests/Controller/CheckSetupControllerTest.php
@@ -86,13 +86,6 @@ class CheckSetupControllerTest extends TestCase {
 	/** @var ISetupCheckManager|MockObject */
 	private $setupCheckManager;
 
-	/**
-	 * Holds a list of directories created during tests.
-	 *
-	 * @var array
-	 */
-	private $dirsToRemove = [];
-
 	protected function setUp(): void {
 		parent::setUp();
 
@@ -145,19 +138,6 @@ class CheckSetupControllerTest extends TestCase {
 			])->getMock();
 	}
 
-	/**
-	 * Removes directories created during tests.
-	 *
-	 * @after
-	 * @return void
-	 */
-	public function removeTestDirectories() {
-		foreach ($this->dirsToRemove as $dirToRemove) {
-			rmdir($dirToRemove);
-		}
-		$this->dirsToRemove = [];
-	}
-
 	public function testCheck() {
 		$this->config->expects($this->any())
 			->method('getAppValue')
diff --git a/apps/settings/tests/SetupChecks/AppDirsWithDifferentOwnerTest.php b/apps/settings/tests/SetupChecks/AppDirsWithDifferentOwnerTest.php
index 06a75225cb4..9216be3ace5 100644
--- a/apps/settings/tests/SetupChecks/AppDirsWithDifferentOwnerTest.php
+++ b/apps/settings/tests/SetupChecks/AppDirsWithDifferentOwnerTest.php
@@ -33,6 +33,13 @@ class AppDirsWithDifferentOwnerTest extends TestCase {
 	private IL10N $l10n;
 	private AppDirsWithDifferentOwner $check;
 
+	/**
+	 * Holds a list of directories created during tests.
+	 *
+	 * @var array
+	 */
+	private $dirsToRemove = [];
+
 	protected function setUp(): void {
 		parent::setUp();
 
@@ -97,4 +104,17 @@ class AppDirsWithDifferentOwnerTest extends TestCase {
 			$this->invokePrivate($this->check, 'getAppDirsWithDifferentOwner', [posix_getuid()])
 		);
 	}
+
+	/**
+	 * Removes directories created during tests.
+	 *
+	 * @after
+	 * @return void
+	 */
+	public function removeTestDirectories() {
+		foreach ($this->dirsToRemove as $dirToRemove) {
+			rmdir($dirToRemove);
+		}
+		$this->dirsToRemove = [];
+	}
 }
-- 
cgit v1.2.3