test: conform Azure adapter tests to phpbu's mock pattern

Replace the in-file Testable* subclass doubles with phpbu's standard
PHPUnit mock pattern (createPartialMock / getMockBuilder->onlyMethods),
matching the sibling AmazonS3v3 tests. The azure-oss client is final, so
the mocks target the adapter's own protected seams rather than the SDK
client; coverage of the orchestration is preserved.

Assert the values passed to the SDK seams via with() matchers instead of
capturing internal state: the upload path, the list prefix and the
deleted blob path are now verified, and the File fixture uses a nested
blob name so pathname and filename are distinguishable.

Also align the adapters with the AmazonS3v3 sibling: $client is now
protected (Sync and File), and File\AzureBlob::deleteBlob() takes the
blob path as an argument.

Signed-off-by: Sebastian Mendel <sebastian.mendel@netresearch.de>

Author: CybotTM

src/Backup/File/AzureBlob.php

@@ -24,7 +24,7 @@ class AzureBlob extends Remote
      *
      * @var BlobContainerClient
      */
-    private $client;
+    protected $client;
 
     /**
      * AzureBlob constructor.
@@ -49,17 +49,19 @@ public function __construct(BlobContainerClient $client, Blob $blob)
     public function unlink()
     {
         try {
-            $this->deleteBlob();
+            $this->deleteBlob($this->pathname);
         } catch (\Exception $exception) {
             throw new Exception($exception->getMessage());
         }
     }
 
     /**
      * Delete the blob from the container.
+     *
+     * @param string $path
      */
-    protected function deleteBlob(): void
+    protected function deleteBlob(string $path): void
     {
-        $this->client->getBlobClient($this->pathname)->delete();
+        $this->client->getBlobClient($path)->delete();
     }
 }

src/Backup/Sync/AzureBlob.php

@@ -30,8 +30,7 @@ class AzureBlob implements Simulator
      *
      * @var BlobContainerClient
      */
-    private $client;
-
+    protected $client;
 
     /**
      * Azure Blob Connection String

tests/phpbu/Backup/Collector/AzureBlobTest.php

@@ -10,25 +10,6 @@
 use phpbu\App\Backup\Target;
 use PHPUnit\Framework\TestCase;
 
-/**
- * Test double exposing a controllable blob listing seam so the real
- * AzureBlob collector logic runs without hitting the (final) Azure SDK client.
- */
-class TestableAzureBlobCollector extends AzureBlob
-{
-    /** @var \AzureOss\Storage\Blob\Models\Blob[] */
-    public $blobs = [];
-
-    /** @var string|null */
-    public $capturedPrefix = null;
-
-    protected function listBlobs(string $prefix): iterable
-    {
-        $this->capturedPrefix = $prefix;
-        return $this->blobs;
-    }
-}
-
 /**
  * AzureBlob Collector test
  *
@@ -54,16 +35,23 @@ public function testCollector()
         $target   = new Target($pathName, $filename, strtotime('2014-12-07 04:30:57'));
         $path     = new Path($pathName, $time, false);
 
-        $collector = new TestableAzureBlobCollector($target, $path, $this->createContainerClient());
-        $collector->blobs = [
+        $blobs = [
             $this->createBlob('collector/static-dir/not-matching-2000-12-01-12_00.txt', '2000-12-01 12:00:00 +00:00'),
             $this->createBlob('collector/static-dir/foo-2000-12-01-12_00.txt', '2000-12-01 12:00:00 +00:00'),
             $this->createBlob($target->getPathname(), '2018-05-08 14:14:54 +00:00'),
         ];
 
+        $collector = $this->getMockBuilder(AzureBlob::class)
+            ->setConstructorArgs([$target, $path, $this->createContainerClient()])
+            ->onlyMethods(['listBlobs'])
+            ->getMock();
+        $collector->expects($this->once())
+                  ->method('listBlobs')
+                  ->with($this->equalTo('collector/static-dir/'))
+                  ->willReturn($blobs);
+
         $files = $collector->getBackupFiles();
 
-        $this->assertEquals('collector/static-dir/', $collector->capturedPrefix, 'blobs must be listed with the static path prefix');
         $this->assertCount(2, $files);
         $this->assertArrayHasKey('975672000-foo-2000-12-01-12_00.txt-0', $files);
         $this->assertEquals(
@@ -83,8 +71,13 @@ public function testNoBlobResult()
         $target   = new Target($pathName, $filename, strtotime('2014-12-07 04:30:57'));
         $path     = new Path('', $time, false);
 
-        $collector = new TestableAzureBlobCollector($target, $path, $this->createContainerClient());
-        $collector->blobs = [];
+        $collector = $this->getMockBuilder(AzureBlob::class)
+            ->setConstructorArgs([$target, $path, $this->createContainerClient()])
+            ->onlyMethods(['listBlobs'])
+            ->getMock();
+        $collector->expects($this->once())
+                  ->method('listBlobs')
+                  ->willReturn([]);
 
         $this->assertEquals([], $collector->getBackupFiles());
     }

tests/phpbu/Backup/File/AzureBlobTest.php

@@ -8,31 +8,6 @@
 use DateTimeImmutable;
 use PHPUnit\Framework\TestCase;
 
-/**
- * Test double exposing a controllable blob deletion seam so the real
- * AzureBlob logic runs without hitting the (final) Azure SDK client.
- */
-class TestableAzureBlobFile extends AzureBlob
-{
-    /** @var bool */
-    public $deleted = false;
-
-    /** @var bool */
-    public $deleteThrows = false;
-
-    /** @var string|null */
-    public $deletedPathname = null;
-
-    protected function deleteBlob(): void
-    {
-        if ($this->deleteThrows) {
-            throw new \Exception('delete failed');
-        }
-        $this->deleted         = true;
-        $this->deletedPathname = $this->pathname;
-    }
-}
-
 /**
  * AzureBlobTest
  *
@@ -52,17 +27,22 @@ class AzureBlobTest extends TestCase
      */
     public function testCreateFileWithCorrectProperties()
     {
-        $blob = $this->createBlob('dump.tar.gz', '2018-05-08 14:14:54.0 +00:00', 102102);
-        $file = new TestableAzureBlobFile($this->createContainerClient(), $blob);
+        $blob = $this->createBlob('collector/static-dir/dump.tar.gz', '2018-05-08 14:14:54.0 +00:00', 102102);
+
+        $file = $this->getMockBuilder(AzureBlob::class)
+            ->setConstructorArgs([$this->createContainerClient(), $blob])
+            ->onlyMethods(['deleteBlob'])
+            ->getMock();
+        $file->expects($this->once())
+             ->method('deleteBlob')
+             ->with($this->equalTo('collector/static-dir/dump.tar.gz'));
 
         $this->assertEquals('dump.tar.gz', $file->getFilename());
-        $this->assertEquals('dump.tar.gz', $file->getPathname());
+        $this->assertEquals('collector/static-dir/dump.tar.gz', $file->getPathname());
         $this->assertEquals(102102, $file->getSize());
         $this->assertEquals(1525788894, $file->getMTime());
 
         $file->unlink();
-        $this->assertTrue($file->deleted, 'blob should be deleted');
-        $this->assertEquals('dump.tar.gz', $file->deletedPathname, 'the correct blob must be targeted for deletion');
     }
 
     /**
@@ -72,9 +52,13 @@ public function testAzureBlobDeleteFailure()
     {
         $this->expectException('phpbu\App\Exception');
 
-        $blob = $this->createBlob('dump.tar.gz', '2018-05-08 14:14:54.0 +00:00', 102102);
-        $file = new TestableAzureBlobFile($this->createContainerClient(), $blob);
-        $file->deleteThrows = true;
+        $blob = $this->createBlob('collector/static-dir/dump.tar.gz', '2018-05-08 14:14:54.0 +00:00', 102102);
+
+        $file = $this->getMockBuilder(AzureBlob::class)
+            ->setConstructorArgs([$this->createContainerClient(), $blob])
+            ->onlyMethods(['deleteBlob'])
+            ->getMock();
+        $file->method('deleteBlob')->will($this->throwException(new \Exception()));
 
         $file->unlink();
     }