add cache class validation, add autoloader validation

Author: bshaffer

Spanner/tests/Unit/Session/SessionCacheTest.php

@@ -17,6 +17,7 @@
 
 namespace Google\Cloud\Spanner\Tests\Unit\Session;
 
+use Google\Auth\Cache\SysVCacheItemPool;
 use Google\Cloud\Spanner\Session\SessionCache;
 use Google\Cloud\Spanner\V1\Client\SpannerClient;
 use Google\Cloud\Spanner\V1\Session;
@@ -26,6 +27,7 @@
 use Prophecy\PhpUnit\ProphecyTrait;
 use Psr\Cache\CacheItemInterface;
 use Psr\Cache\CacheItemPoolInterface;
+use ReflectionClass;
 use Symfony\Component\Process\Process;
 
 /**
@@ -72,9 +74,7 @@ public function testEnsureValidSessionCacheHit()
         $session = new SessionCache(
             $this->spannerClient->reveal(),
             $this->databaseName,
-            [
-                'cacheItemPool' => $cacheItemPool->reveal(),
-            ]
+            ['cacheItemPool' => $cacheItemPool->reveal()]
         );
         $name = $session->name();
         $this->assertEquals($this->sessionName, $name);
@@ -181,6 +181,9 @@ public function testCacheLocking()
             $databaseName,
         );
 
+        $cacheItemPoolProp = (new ReflectionClass($sessionCache))->getProperty('cacheItemPool');
+        $this->assertInstanceOf(SysVCacheItemPool::class, $cacheItemPoolProp->getValue($sessionCache));
+
         $process = new Process(['php', __DIR__ . '/lock_test_process.php', $databaseName]);
         $process->setTimeout(5);
 

Spanner/tests/Unit/Session/lock_test_process.php

@@ -3,6 +3,8 @@
 namespace Google\Cloud\Spanner\Tests\Unit\Session;
 
 use DG\BypassFinals;
+use Exception;
+use Google\Auth\Cache\SysVCacheItemPool;
 use Google\Cloud\Spanner\Session\SessionCache;
 use Google\Cloud\Spanner\V1\Client\SpannerClient;
 use Prophecy\Argument;
@@ -15,12 +17,21 @@
     die('Usage: lock_test_process.php DATABASE_NAME' . PHP_EOL);
 }
 
-if (file_exists(__DIR__ . '/../../../vendor/autoload.php')) {
+$spannerAutoload = __DIR__ . '/../../../vendor/autoload.php';
+$googleCloudAutoload = __DIR__ . '/../../../../vendor/autoload.php';
+
+if (file_exists($spannerAutoload) && file_exists($googleCloudAutoload)) {
+    throw new Exception('Both autoloaders exist, please remove one');
+}
+
+if (file_exists($spannerAutoload)) {
     // google/cloud-spanner autoload
-    require __DIR__ . '/../../../vendor/autoload.php';
-} elseif (file_exists(__DIR__ . '/../../../../vendor/autoload.php')) {
+    require $spannerAutoload;
+} elseif (file_exists($googleCloudAutoload)) {
     // google/cloud autoload
-    require __DIR__ . '/../../../../vendor/autoload.php';
+    require $googleCloudAutoload;
+} else {
+    throw new Exception('no autoloader found');
 }
 
 BypassFinals::enable();
@@ -39,13 +50,17 @@ public function run(): string
             ->will(function () {
                 throw new \Exception('createSession called in child process - this shouldn\'t happen');
             });
-
-        $parts = explode('/', $this->databaseName);
         $sessionCache = new SessionCache(
             $spannerClient->reveal(),
             $this->databaseName,
         );
 
+        $cacheItemPoolProp = (new \ReflectionClass($sessionCache))->getProperty('cacheItemPool');
+        $cacheItemPool = $cacheItemPoolProp->getValue($sessionCache);
+        if (!$cacheItemPool instanceof SysVCacheItemPool) {
+            throw new \Exception('Expected SysvCacheItemPool, found ' . get_class($cacheItemPool));
+        }
+
         return $sessionCache->name();
     }