From cbae649991509561575e347438b3638fe280d604 Mon Sep 17 00:00:00 2001
From: Hugo Sales <hugo@hsal.es>
Date: Sun, 13 Mar 2022 18:11:11 +0000
Subject: [PATCH] [PLUGIN][ActivityPub][TESTS] Move ActivityPub test fixtures
 to new facility

---
 .../ActivityPub/tests/Objects/GSGroupTest.php |  4 ++--
 .../tests/Objects/GSPersonTest.php            |  4 ++--
 .../ActivityPubFixtures.php}                  | 20 ++++++-------------
 3 files changed, 10 insertions(+), 18 deletions(-)
 rename plugins/ActivityPub/tests/{ActivityPubTestCase.php => fixtures/ActivityPubFixtures.php} (79%)

diff --git a/plugins/ActivityPub/tests/Objects/GSGroupTest.php b/plugins/ActivityPub/tests/Objects/GSGroupTest.php
index 4db248bfb7..796ec8a187 100644
--- a/plugins/ActivityPub/tests/Objects/GSGroupTest.php
+++ b/plugins/ActivityPub/tests/Objects/GSGroupTest.php
@@ -24,12 +24,12 @@ declare(strict_types = 1);
 namespace Plugin\ActivityPub\tests\Objects;
 
 use App\Entity\Actor;
+use App\Util\GNUsocialTestCase;
 use Plugin\ActivityPub\Entity\ActivitypubActor;
 use Plugin\ActivityPub\Entity\ActivitypubRsa;
-use Plugin\ActivityPub\tests\ActivityPubTestCase;
 use Plugin\ActivityPub\Util\Explorer;
 
-class GSGroupTest extends ActivityPubTestCase
+class GSGroupTest extends GNUsocialTestCase
 {
     public function testGroupFromJson()
     {
diff --git a/plugins/ActivityPub/tests/Objects/GSPersonTest.php b/plugins/ActivityPub/tests/Objects/GSPersonTest.php
index 288e73d7de..1f496e7f03 100644
--- a/plugins/ActivityPub/tests/Objects/GSPersonTest.php
+++ b/plugins/ActivityPub/tests/Objects/GSPersonTest.php
@@ -24,12 +24,12 @@ declare(strict_types = 1);
 namespace Plugin\ActivityPub\tests\Objects;
 
 use App\Entity\Actor;
+use App\Util\GNUsocialTestCase;
 use Plugin\ActivityPub\Entity\ActivitypubActor;
 use Plugin\ActivityPub\Entity\ActivitypubRsa;
-use Plugin\ActivityPub\tests\ActivityPubTestCase;
 use Plugin\ActivityPub\Util\Explorer;
 
-class GSPersonTest extends ActivityPubTestCase
+class GSPersonTest extends GNUsocialTestCase
 {
     public function testPersonFromJson()
     {
diff --git a/plugins/ActivityPub/tests/ActivityPubTestCase.php b/plugins/ActivityPub/tests/fixtures/ActivityPubFixtures.php
similarity index 79%
rename from plugins/ActivityPub/tests/ActivityPubTestCase.php
rename to plugins/ActivityPub/tests/fixtures/ActivityPubFixtures.php
index c417fb2ab2..8b4d715bd0 100644
--- a/plugins/ActivityPub/tests/ActivityPubTestCase.php
+++ b/plugins/ActivityPub/tests/fixtures/ActivityPubFixtures.php
@@ -2,17 +2,17 @@
 
 declare(strict_types = 1);
 
-namespace Plugin\ActivityPub\tests;
+namespace Plugin\ActivityPub\Test\Fixtures;
 
 use App\Core\DB\DB;
-use App\Util\GNUsocialTestCase;
+use Doctrine\Bundle\FixturesBundle\Fixture;
+use Doctrine\Persistence\ObjectManager;
 use Plugin\ActivityPub\Util\Model\Activity;
 use Plugin\ActivityPub\Util\Model\Actor;
 use Plugin\ActivityPub\Util\Model\Note;
 
-class ActivityPubTestCase extends GNUsocialTestCase
+class ActivityPubFixtures extends Fixture
 {
-    private static bool $loaded_fixtures = false;
     private static string $fixtures_path = INSTALLDIR . '/plugins/ActivityPub/tests/fixtures';
 
     public static function fixturesPath(string $path, string $ontology = 'gnusocial'): string
@@ -20,21 +20,13 @@ class ActivityPubTestCase extends GNUsocialTestCase
         return self::$fixtures_path . \DIRECTORY_SEPARATOR . $ontology . \DIRECTORY_SEPARATOR . $path;
     }
 
-    public static function setUpBeforeClass(): void
-    {
-        static::bootKernel();
-        if (!static::$loaded_fixtures) {
-            static::loadFixtures();
-        }
-        static::$loaded_fixtures = true;
-    }
-
-    public static function loadFixtures(string $ontology = 'gnusocial'): void
+    public function load(ObjectManager $manager)
     {
         /*
          * Beware that it's important to Load Actors, Objects, Activities in this sequence
          * because we're running offline tests here.
          */
+        $ontology = 'gnusocial';
 
         // Load Actors
         $person = Actor::fromJson(file_get_contents(self::fixturesPath('objects/person.jsonld', $ontology)));