fix tests

Author: soatok

tests/ActivityPub/WebFingerTest.php

@@ -30,7 +30,7 @@
     Psr7\Response};
 use ParagonIE\Certainty\{
     Exception\CertaintyException,
-    RemoteFetch
+    Fetch
 };
 use PHPUnit\Framework\{
     Attributes\CoversClass,
@@ -79,7 +79,7 @@ public function testConstructorDefaults(): void
         $webFinger = new WebFinger($this->getConfig());
 
         $fetchProp = new ReflectionProperty(WebFinger::class, 'fetch');
-        $this->assertInstanceOf(RemoteFetch::class, $fetchProp->getValue($webFinger));
+        $this->assertInstanceOf(Fetch::class, $fetchProp->getValue($webFinger));
 
         $httpProp = new ReflectionProperty(WebFinger::class, 'http');
         $this->assertInstanceOf(Client::class, $httpProp->getValue($webFinger));

tests/Integration/ActorLifecycleTest.php

@@ -82,7 +82,6 @@
     InvalidCiphertextException
 };
 use ParagonIE\HPKE\HPKEException;
-use ParagonIE\HPKE\KEM\PostQuantumKEM;
 use PHPUnit\Framework\TestCase;
 use Psr\SimpleCache\InvalidArgumentException;
 use Random\RandomException;
@@ -125,6 +124,10 @@ public function setUp(): void
         $this->truncateTables();
     }
 
+    /**
+     * @throws CertaintyException
+     * @throws SodiumException
+     */
     public function tearDown(): void
     {
         Handler::setWebFinger(new PKDCryptoWebFinger());

tests/RequestHandlers/Api/RevokeTest.php

@@ -4,10 +4,7 @@
 
 use Exception;
 use FediE2EE\PKD\Crypto\Exceptions\BundleException;
-use FediE2EE\PKD\Crypto\Protocol\Actions\{
-    AddKey,
-    RevokeKeyThirdParty
-};
+use FediE2EE\PKD\Crypto\Protocol\Actions\AddKey;
 use FediE2EE\PKD\Crypto\{AttributeEncryption\AttributeKeyMap,
     Exceptions\InputException,
     Protocol\Handler,
@@ -44,6 +41,7 @@
 };
 use FediE2EE\PKDServer\Tests\HttpTestTrait;
 use FediE2EE\PKDServer\Traits\ConfigTrait;
+use GuzzleHttp\Exception\ServerException;
 use GuzzleHttp\Psr7\Response;
 use PHPUnit\Framework\TestCase;
 use PHPUnit\Framework\Attributes\{
@@ -102,7 +100,11 @@ public function testHandle(): void
         $handler = new Handler();
 
         // Add a key
-        $addKey = new AddKey($canonical, $keypair->getPublicKey());
+        try {
+            $addKey = new AddKey($canonical, $keypair->getPublicKey());
+        } catch (ServerException $ex) {
+            $this->markTestSkipped($ex->getMessage());
+        }
         $akm = (new AttributeKeyMap())
             ->addKey('actor', SymmetricKey::generate())
             ->addKey('public-key', SymmetricKey::generate());