Checks for crypt_shared and/or mongocryptd in FunctionalTestCase::skipIfClientSideEncryptionIsNotSupported

Author: GromNaN

tests/DocumentationExamplesTest.php

@@ -1810,10 +1810,7 @@ public function testQueryableEncryption(): void
         }
 
         $this->skipIfServerVersion('<', '7.0.0', 'Explicit encryption tests require MongoDB 7.0 or later');
-
-        if (! static::isCryptSharedLibAvailable() && ! static::isMongocryptdAvailable()) {
-            $this->markTestSkipped('Neither crypt_shared nor mongocryptd are available');
-        }
+        $this->skipIfClientSideEncryptionIsNotSupported();
 
         // Fetch names for the database and collection under test
         $collectionName = $this->getCollectionName();

tests/FunctionalTestCase.php

@@ -531,6 +531,10 @@ protected function skipIfClientSideEncryptionIsNotSupported(): void
         if (static::getModuleInfo('libmongocrypt') === 'disabled') {
             $this->markTestSkipped('Client Side Encryption is not enabled in the MongoDB extension');
         }
+
+        if (! static::isCryptSharedLibAvailable() && ! static::isMongocryptdAvailable()) {
+            $this->markTestSkipped('Neither crypt_shared nor mongocryptd are available');
+        }
     }
 
     protected function skipIfGeoHaystackIndexIsNotSupported(): void
@@ -568,7 +572,7 @@ protected function skipIfTransactionsAreNotSupported(): void
     }
 
     /** @see https://www.mongodb.com/docs/manual/core/queryable-encryption/reference/shared-library/ */
-    protected static function isCryptSharedLibAvailable(): bool
+    public static function isCryptSharedLibAvailable(): bool
     {
         $cryptSharedLibPath = getenv('CRYPT_SHARED_LIB_PATH');
 
@@ -580,7 +584,7 @@ protected static function isCryptSharedLibAvailable(): bool
     }
 
     /** @see https://www.mongodb.com/docs/manual/core/queryable-encryption/reference/mongocryptd/ */
-    protected static function isMongocryptdAvailable(): bool
+    public static function isMongocryptdAvailable(): bool
     {
         $paths = explode(PATH_SEPARATOR, getenv("PATH"));
 

tests/SpecTests/ClientSideEncryptionSpecTest.php

@@ -117,10 +117,6 @@ public function setUp(): void
         parent::setUp();
 
         $this->skipIfClientSideEncryptionIsNotSupported();
-
-        if (! static::isCryptSharedLibAvailable() && ! static::isMongocryptdAvailable()) {
-            $this->markTestSkipped('Neither crypt_shared nor mongocryptd are available');
-        }
     }
 
     /**

tests/UnifiedSpecTests/UnifiedTestRunner.php

@@ -337,6 +337,8 @@ private function isAuthenticated(): bool
 
     /**
      * Return whether client-side encryption is supported.
+     *
+     * @see FunctionalTestCase::skipIfClientSideEncryptionIsNotSupported()
      */
     private function isClientSideEncryptionSupported(): bool
     {
@@ -350,7 +352,7 @@ private function isClientSideEncryptionSupported(): bool
             return false;
         }
 
-        return static::isCryptSharedLibAvailable() || static::isMongocryptdAvailable();
+        return FunctionalTestCase::isCryptSharedLibAvailable() || FunctionalTestCase::isMongocryptdAvailable();
     }
 
     /**