8 files changed, 25 insertions, 16 deletions
diff --git a/tests/lib/Files/ObjectStore/AzureTest.php b/tests/lib/Files/ObjectStore/AzureTest.php
index c82ed988434..1103b15ecd2 100644
--- a/tests/lib/Files/ObjectStore/AzureTest.php
+++ b/tests/lib/Files/ObjectStore/AzureTest.php
@@ -11,7 +11,7 @@ use OC\Files\ObjectStore\Azure;
 /**
  * @group PRIMARY-azure
  */
-class AzureTest extends ObjectStoreTest {
+class AzureTest extends ObjectStoreTestCase {
 	protected function getInstance() {
 		$config = \OC::$server->getConfig()->getSystemValue('objectstore');
 		if (!is_array($config) || $config['class'] !== 'OC\\Files\\ObjectStore\\Azure') {
diff --git a/tests/lib/Files/ObjectStore/LocalTest.php b/tests/lib/Files/ObjectStore/LocalTest.php
index 99c5b61534f..3b561c01049 100644
--- a/tests/lib/Files/ObjectStore/LocalTest.php
+++ b/tests/lib/Files/ObjectStore/LocalTest.php
@@ -9,7 +9,7 @@ namespace Test\Files\ObjectStore;
 use OC\Files\ObjectStore\StorageObjectStore;
 use OC\Files\Storage\Temporary;
 
-class LocalTest extends ObjectStoreTest {
+class LocalTest extends ObjectStoreTestCase {
 	/**
 	 * @return \OCP\Files\ObjectStore\IObjectStore
 	 */
diff --git a/tests/lib/Files/ObjectStore/MapperTest.php b/tests/lib/Files/ObjectStore/MapperTest.php
index 15a2d497fc3..77416eae09a 100644
--- a/tests/lib/Files/ObjectStore/MapperTest.php
+++ b/tests/lib/Files/ObjectStore/MapperTest.php
@@ -29,7 +29,7 @@ class MapperTest extends \Test\TestCase {
 		$this->mapper = new Mapper($this->user, $this->config);
 	}
 
-	public function dataGetBucket() {
+	public static function dataGetBucket(): array {
 		return [
 			['user', 64, 0, '17'],
 			['USER', 64, 0, '0'],
diff --git a/tests/lib/Files/ObjectStore/ObjectStoreStoragesDifferentBucketTest.php b/tests/lib/Files/ObjectStore/ObjectStoreStoragesDifferentBucketTest.php
index a0e18a5557b..a1befd4e79d 100644
--- a/tests/lib/Files/ObjectStore/ObjectStoreStoragesDifferentBucketTest.php
+++ b/tests/lib/Files/ObjectStore/ObjectStoreStoragesDifferentBucketTest.php
@@ -9,12 +9,12 @@ namespace Test\Files\ObjectStore;
 
 use OC\Files\ObjectStore\StorageObjectStore;
 use OC\Files\Storage\Temporary;
-use Test\Files\Storage\StoragesTest;
+use Test\Files\Storage\StoragesTestCase;
 
 /**
  * @group DB
  */
-class ObjectStoreStoragesDifferentBucketTest extends StoragesTest {
+class ObjectStoreStoragesDifferentBucketTest extends StoragesTestCase {
 	/**
 	 * @var \OCP\Files\ObjectStore\IObjectStore
 	 */
diff --git a/tests/lib/Files/ObjectStore/ObjectStoreStoragesSameBucketTest.php b/tests/lib/Files/ObjectStore/ObjectStoreStoragesSameBucketTest.php
index 19a1f4b7bc5..5505ee1dac1 100644
--- a/tests/lib/Files/ObjectStore/ObjectStoreStoragesSameBucketTest.php
+++ b/tests/lib/Files/ObjectStore/ObjectStoreStoragesSameBucketTest.php
@@ -9,12 +9,12 @@ namespace Test\Files\ObjectStore;
 
 use OC\Files\ObjectStore\StorageObjectStore;
 use OC\Files\Storage\Temporary;
-use Test\Files\Storage\StoragesTest;
+use Test\Files\Storage\StoragesTestCase;
 
 /**
  * @group DB
  */
-class ObjectStoreStoragesSameBucketTest extends StoragesTest {
+class ObjectStoreStoragesSameBucketTest extends StoragesTestCase {
 	/**
 	 * @var \OCP\Files\ObjectStore\IObjectStore
 	 */
diff --git a/tests/lib/Files/ObjectStore/ObjectStoreTest.php b/tests/lib/Files/ObjectStore/ObjectStoreTestCase.php
index 4a4f85dfb91..ecbfd9a37e6 100644
--- a/tests/lib/Files/ObjectStore/ObjectStoreTest.php
+++ b/tests/lib/Files/ObjectStore/ObjectStoreTestCase.php
@@ -9,10 +9,12 @@ namespace Test\Files\ObjectStore;
 
 use Test\TestCase;
 
-abstract class ObjectStoreTest extends TestCase {
+abstract class ObjectStoreTestCase extends TestCase {
 	/** @var string[] */
 	private $cleanup = [];
 
+	private $instance = null;
+
 	/**
 	 * @return \OCP\Files\ObjectStore\IObjectStore
 	 */
@@ -22,13 +24,20 @@ abstract class ObjectStoreTest extends TestCase {
 		$this->cleanup[] = $urn;
 	}
 
-	public function tearDown(): void {
-		parent::tearDown();
+	public function setUp(): void {
+		parent::setUp();
 
-		$instance = $this->getInstance();
-		foreach ($this->cleanup as $urn) {
-			$instance->deleteObject($urn);
+		$this->instance = $this->getInstance();
+	}
+
+	public function tearDown(): void {
+		if ($this->instance) {
+			foreach ($this->cleanup as $urn) {
+				$this->instance->deleteObject($urn);
+			}
 		}
+
+		parent::tearDown();
 	}
 
 	protected function stringToStream($data) {
diff --git a/tests/lib/Files/ObjectStore/S3Test.php b/tests/lib/Files/ObjectStore/S3Test.php
index 1501f575f9a..76fc80c975f 100644
--- a/tests/lib/Files/ObjectStore/S3Test.php
+++ b/tests/lib/Files/ObjectStore/S3Test.php
@@ -44,7 +44,7 @@ class NonSeekableStream extends Wrapper {
 /**
  * @group PRIMARY-s3
  */
-class S3Test extends ObjectStoreTest {
+class S3Test extends ObjectStoreTestCase {
 	public function setUp(): void {
 		parent::setUp();
 		$s3 = $this->getInstance();
@@ -126,7 +126,7 @@ class S3Test extends ObjectStoreTest {
 	}
 
 	/** File size to upload in bytes */
-	public function dataFileSizes() {
+	public static function dataFileSizes(): array {
 		return [
 			[1000000], [2000000], [5242879], [5242880], [5242881], [10000000]
 		];
diff --git a/tests/lib/Files/ObjectStore/SwiftTest.php b/tests/lib/Files/ObjectStore/SwiftTest.php
index 8a34d25e57b..9fb8c9bb68e 100644
--- a/tests/lib/Files/ObjectStore/SwiftTest.php
+++ b/tests/lib/Files/ObjectStore/SwiftTest.php
@@ -12,7 +12,7 @@ use OC\Files\ObjectStore\Swift;
 /**
  * @group PRIMARY-swift
  */
-class SwiftTest extends ObjectStoreTest {
+class SwiftTest extends ObjectStoreTestCase {
 	/**
 	 * @return \OCP\Files\ObjectStore\IObjectStore
 	 */