Strengthen Azure Blob adapter tests after review

- Narrow the upload seam (uploadBlob) so the real upload() body and
  getUploadPath() composition run under test; assert the computed blob path.
- Assert the listBlobs() prefix and the deleted blob pathname so a wrong
  prefix / wrong-target regression is caught.
- Replace brittle exact debug() call-count expectations with assertions on
  the actual log messages and resulting state.
- Assert simulate() masks the credential-bearing connection string
  (connectionString: ********) and never logs the raw value.

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

Author: CybotTM

src/Backup/Sync/AzureBlob.php

@@ -211,7 +211,19 @@ protected function createContainer(BlobContainerClient $client)
     protected function upload(Target $target, BlobContainerClient $client)
     {
         $source = $this->getFileHandle($target->getPathname(), 'r');
-        $client->getBlobClient($this->getUploadPath($target))->upload($source);
+        $this->uploadBlob($client, $this->getUploadPath($target), $source);
+    }
+
+    /**
+     * Upload a single blob to the container.
+     *
+     * @param  \AzureOss\Storage\Blob\BlobContainerClient $client
+     * @param  string                                     $path
+     * @param  resource                                   $source
+     */
+    protected function uploadBlob(BlobContainerClient $client, string $path, $source)
+    {
+        $client->getBlobClient($path)->upload($source);
     }
 
     /**

tests/phpbu/Backup/Collector/AzureBlobTest.php

@@ -19,8 +19,12 @@ 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;
     }
 }
@@ -59,6 +63,7 @@ public function testCollector()
 
         $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(

tests/phpbu/Backup/File/AzureBlobTest.php

@@ -20,12 +20,16 @@ class TestableAzureBlobFile extends AzureBlob
     /** @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->deleted         = true;
+        $this->deletedPathname = $this->pathname;
     }
 }
 
@@ -58,6 +62,7 @@ public function testCreateFileWithCorrectProperties()
 
         $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');
     }
 
     /**

tests/phpbu/Backup/Sync/AzureBlobTest.php

@@ -24,6 +24,9 @@ class TestableAzureBlobSync extends AzureBlob
     /** @var bool */
     public $uploaded = false;
 
+    /** @var string|null */
+    public $uploadedPath = null;
+
     /** @var bool */
     public $uploadThrows = false;
 
@@ -45,12 +48,17 @@ protected function createContainer(BlobContainerClient $client)
         $this->containerCreated = true;
     }
 
-    protected function upload(Target $target, BlobContainerClient $client)
+    /**
+     * Narrow seam: the real upload() body (file handle + getUploadPath) runs;
+     * only the final SDK call is replaced, capturing the computed blob path.
+     */
+    protected function uploadBlob(BlobContainerClient $client, string $path, $source)
     {
         if ($this->uploadThrows) {
             throw new \Exception('upload failed');
         }
-        $this->uploaded = true;
+        $this->uploaded     = true;
+        $this->uploadedPath = $path;
     }
 
     protected function getFileHandle($path, $mode)
@@ -160,10 +168,9 @@ public function testCreateClientBuildsContainerClient()
      */
     public function testSync()
     {
-        $target = $this->createTargetMock('foo.txt', 'foo.txt.gz');
-
-        $result = $this->createMock(Result::class);
-        $result->expects($this->exactly(2))->method('debug');
+        $target   = $this->createTargetMock('foo.txt', 'foo.txt.gz');
+        $messages = [];
+        $result   = $this->createDebugCollectingResult($messages);
 
         $azureBlob = new TestableAzureBlobSync();
         $azureBlob->setup([
@@ -176,17 +183,19 @@ public function testSync()
 
         $this->assertTrue($azureBlob->containerCreated, 'missing container should be created');
         $this->assertTrue($azureBlob->uploaded, 'backup should be uploaded');
+        $this->assertStringStartsWith('backup/', (string) $azureBlob->uploadedPath, 'upload path must include the configured remote path');
+        $this->assertContains('create blob container', $messages);
+        $this->assertContains('upload: done', $messages);
     }
 
     /**
      * Tests AzureBlob::sync does not create an already existing container
      */
     public function testSyncContainerAlreadyExists()
     {
-        $target = $this->createTargetMock('foo.txt', 'foo.txt.gz');
-
-        $result = $this->createMock(Result::class);
-        $result->expects($this->once())->method('debug');
+        $target   = $this->createTargetMock('foo.txt', 'foo.txt.gz');
+        $messages = [];
+        $result   = $this->createDebugCollectingResult($messages);
 
         $azureBlob = new TestableAzureBlobSync();
         $azureBlob->containerExists = true;
@@ -200,17 +209,18 @@ public function testSyncContainerAlreadyExists()
 
         $this->assertFalse($azureBlob->containerCreated, 'existing container must not be re-created');
         $this->assertTrue($azureBlob->uploaded, 'backup should be uploaded');
+        $this->assertNotContains('create blob container', $messages, 'must not log container creation when it exists');
+        $this->assertContains('upload: done', $messages);
     }
 
     /**
      * Tests AzureBlob::sync with remote cleanup
      */
     public function testSyncWithRemoteCleanup()
     {
-        $target = $this->createTargetMock('foo.txt', 'foo.txt.gz');
-
-        $result = $this->createMock(Result::class);
-        $result->expects($this->exactly(3))->method('debug');
+        $target   = $this->createTargetMock('foo.txt', 'foo.txt.gz');
+        $messages = [];
+        $result   = $this->createDebugCollectingResult($messages);
 
         $collector = $this->createMock(AzureBlobCollector::class);
         $collector->method('getBackupFiles')->willReturn([]);
@@ -228,6 +238,7 @@ public function testSyncWithRemoteCleanup()
         $azureBlob->sync($target, $result);
 
         $this->assertTrue($azureBlob->uploaded, 'backup should be uploaded');
+        $this->assertContains('upload: done', $messages);
     }
 
     /**
@@ -258,18 +269,37 @@ public function testSimulate()
     {
         $azureBlob = new AzureBlob();
         $azureBlob->setup([
-            'connection_string' => 'dummy-connection-string',
+            'connection_string' => 'super-secret-connection-string',
             'container_name'    => 'dummy-container-name',
             'path' => '/'
         ]);
 
-        $resultStub = $this->createMock(Result::class);
-        $resultStub->expects($this->once())
-                   ->method('debug');
-
+        $messages   = [];
+        $resultStub = $this->createDebugCollectingResult($messages);
         $targetStub = $this->createMock(Target::class);
 
         $azureBlob->simulate($targetStub, $resultStub);
+
+        $this->assertCount(1, $messages);
+        // the credential carrying connection string must never be logged
+        $this->assertStringContainsString('connectionString: ********', $messages[0]);
+        $this->assertStringNotContainsString('super-secret-connection-string', $messages[0]);
+        $this->assertStringContainsString('dummy-container-name', $messages[0]);
+    }
+
+    /**
+     * Build a Result mock that records every debug() message into $messages.
+     *
+     * @param  array $messages
+     * @return \phpbu\App\Result
+     */
+    private function createDebugCollectingResult(array &$messages): Result
+    {
+        $result = $this->createMock(Result::class);
+        $result->method('debug')->willReturnCallback(function ($message) use (&$messages) {
+            $messages[] = $message;
+        });
+        return $result;
     }
 
     /**