Update and add tests

Author: stevebauman

tests/Integration/MessagesTest.php

@@ -182,20 +182,18 @@ function folder(): Folder
         $targetFolderName = uniqid()
     );
 
-    $message->copy($targetFolderName);
+    $newUid = $message->copy($targetFolderName);
 
-    $targetMessages = $targetFolder->messages()
-        ->withHeaders()
-        ->withBody()
-        ->get();
-
-    expect($targetMessages->count())->toBe(1);
+    expect($newUid)->toBeInt();
+    expect($newUid)->toBeGreaterThan(0);
 
-    /** @var Message $movedMessage */
-    $movedMessage = $targetMessages->first();
+    $copiedMessage = $targetFolder->messages()
+        ->withBody()
+        ->withHeaders()
+        ->findOrFail($newUid);
 
-    expect($movedMessage->from()->email())->toBe('[email protected]');
-    expect($movedMessage->text())->toBe('copy test');
+    expect($copiedMessage->from()->email())->toBe('[email protected]');
+    expect($copiedMessage->text())->toBe('copy test');
 });
 
 test('move', function () {
@@ -216,13 +214,14 @@ function folder(): Folder
         $targetFolderName = uniqid()
     );
 
-    $message->move($targetFolderName);
+    expect($message->move($targetFolderName))->toBeNull();
 
     $targetMessages = $targetFolder->messages()
         ->withHeaders()
         ->withBody()
         ->get();
 
+    expect($folder->messages()->count())->toBe(0);
     expect($targetMessages->count())->toBe(1);
 
     /** @var Message $movedMessage */

tests/Unit/Connection/Responses/MessageResponseParserTest.php

@@ -1,7 +1,9 @@
 <?php
 
 use DirectoryTree\ImapEngine\Connection\Responses\Data\ListData;
+use DirectoryTree\ImapEngine\Connection\Responses\Data\ResponseCodeData;
 use DirectoryTree\ImapEngine\Connection\Responses\MessageResponseParser;
+use DirectoryTree\ImapEngine\Connection\Responses\TaggedResponse;
 use DirectoryTree\ImapEngine\Connection\Responses\UntaggedResponse;
 use DirectoryTree\ImapEngine\Connection\Tokens\Atom;
 use DirectoryTree\ImapEngine\Connection\Tokens\Literal;
@@ -89,3 +91,31 @@
 
     expect($parsedFlags)->toBe(['11111' => []]);
 });
+
+it('parses UID from tagged COPYUID response', function () {
+    $response = new TaggedResponse([
+        new Atom('TAG1'),             // Tag
+        new Atom('OK'),               // Status
+        new ResponseCodeData([
+            new Atom('COPYUID'),      // Response code
+            new Atom('1570950167'),   // UIDVALIDITY
+            new Atom('1234'),         // Source UID
+            new Atom('5678'),         // Destination UID
+        ]),
+        new Atom('Move completed.'),  // Human-readable text
+    ]);
+
+    $parsedUid = MessageResponseParser::getUidFromCopy($response);
+
+    expect($parsedUid)->toBe(5678);
+});
+
+it('returns null for non-COPYUID tagged response', function () {
+    $response = new TaggedResponse([
+        new Atom('TAG1'),
+        new Atom('OK'),
+        new Atom('Move completed.'),
+    ]);
+
+    expect(MessageResponseParser::getUidFromCopy($response))->toBeNull();
+});

tests/Unit/MessageTest.php

@@ -7,7 +7,7 @@
 use DirectoryTree\ImapEngine\Mailbox;
 use DirectoryTree\ImapEngine\Message;
 
-test('it moves message using MOVE when capable', function () {
+test('it moves message using MOVE when capable and returns the new UID', function () {
     $mailbox = Mailbox::make([
         'username' => 'foo',
         'password' => 'bar',
@@ -18,17 +18,19 @@
         'TAG1 OK Logged in',
         '* CAPABILITY IMAP4rev1 STARTTLS MOVE AUTH=PLAIN',
         'TAG2 OK CAPABILITY completed',
-        'TAG3 OK MOVE completed',
+        'TAG3 OK [COPYUID 1234567890 1 42] MOVE completed',
     ]));
 
     $folder = new Folder($mailbox, 'INBOX', [], '/');
 
     $message = new Message($folder, 1, [], 'header', 'body');
 
-    $message->move('INBOX.Sent');
-})->throwsNoExceptions();
+    $newUid = $message->move('INBOX.Sent');
+
+    expect($newUid)->toBe(42);
+});
 
-test('it copies and then deletes message using UIDPLUS when incapable of MOVE', function () {
+test('it copies and then deletes message using UIDPLUS when incapable of MOVE and returns the new UID', function () {
     $mailbox = Mailbox::make([
         'username' => 'foo',
         'password' => 'bar',
@@ -39,16 +41,18 @@
         'TAG1 OK Logged in',
         '* CAPABILITY IMAP4rev1 STARTTLS UIDPLUS AUTH=PLAIN',
         'TAG2 OK CAPABILITY completed',
-        'TAG3 OK UID MOVE completed',
-        'TAG4 OK COPY completed',
+        'TAG3 OK [COPYUID 1234567890 1 123] COPY completed',
+        'TAG4 OK STORE completed',
     ]));
 
     $folder = new Folder($mailbox, 'INBOX', [], '/');
 
     $message = new Message($folder, 1, [], 'header', 'body');
 
-    $message->move('INBOX.Sent');
-})->throwsNoExceptions();
+    $newUid = $message->move('INBOX.Sent');
+
+    expect($newUid)->toBe(123);
+});
 
 test('it throws exception when server does not support MOVE or UIDPLUS capabilities', function () {
     $mailbox = Mailbox::make([