test(mailbox): refact Mailbox test

Author: Shadow243

modules/core/hm-mailbox.php

@@ -46,6 +46,14 @@ public function __construct($server_id, $user_config, $session, $config) {
         }
     }
 
+    /**
+     * Set connection
+     * @param object $connection The connection object to inject
+     */
+    public function set_connection($connection) {
+        $this->connection = $connection;
+    }
+
     public function connect() {
         if (! $this->connection) {
             return false;
@@ -563,6 +571,14 @@ public function search($folder, $target='ALL', $terms=array(), $sort=null, $reve
         if (! $this->select_folder($folder)) {
             return [];
         }
+        
+        // Handle JMAP specifically since it's "IMAP-like" but has different method signatures
+        if ($this->type === self::TYPE_JMAP) {
+            // JMAP search uses IMAP-like parameters but handles sorting internally
+            $uids = $this->connection->search($target, false, $terms, [], $exclude_deleted, $exclude_auto_bcc, $only_auto_bcc);
+            return $uids;
+        }
+        
         if ($this->is_imap()) {
             if ($sort) {
                 if ($this->connection->is_supported('SORT')) {

modules/imap/hm-imap.php

@@ -178,7 +178,7 @@ class Hm_IMAP extends Hm_IMAP_Cache {
         );
 
         /* holds the current IMAP connection state */
-        private $state = 'disconnected';
+        public $state = 'disconnected';
 
         /* used for message part content streaming */
         private $stream_size = 0;

modules/imap/hm-jmap.php

@@ -1359,4 +1359,35 @@ private function get_raw_message_content($blob_id, $name) {
         $this->api->format = 'json';
         return $res;
     }
+
+    /**
+     * Check if a feature is supported (JMAP compatibility method)
+     * JMAP doesn't use IMAP extensions, so most features are handled differently
+     */
+    public function is_supported($feature) {
+        // TODO: Implement more features as needed, but most IMAP features don't have direct JMAP equivalents
+        return false;
+    }
+
+    /**
+     * Get message sort order (JMAP compatibility method) 
+     * This provides IMAP-like interface for JMAP sorting
+     * JMAP doesn't have direct equivalent to IMAP SORT
+     * Fall back to search and let JMAP handle sorting internally
+     */
+    public function get_message_sort_order($sort, $reverse=false, $target='ALL', $terms=array(), $exclude_deleted=true, $exclude_auto_bcc=true, $only_auto_bcc=false) {
+        return $this->search($target, false, $terms, [], $exclude_deleted, $exclude_auto_bcc, $only_auto_bcc);
+    }
+
+    /**
+     * Sort by fetch (JMAP compatibility method)
+     * JMAP doesn't need this since it handles sorting differently
+     */
+    public function sort_by_fetch($sort, $reverse=false, $target='ALL', $uids='') {
+        // TODO: implement according to JMAP spec if needed
+        if (empty($uids)) {
+            return [];
+        }
+        return explode(',', $uids);
+    }
 }

tests/phpunit/bootstrap.php

@@ -27,6 +27,14 @@
 /* get mock objects */
 require APP_PATH.'tests/phpunit/mocks.php';
 
+
+/* get the imap|jmap|ews|smtp classes */
+require_once APP_PATH.'modules/imap/hm-imap.php';
+require_once APP_PATH.'modules/imap/hm-jmap.php';
+require_once APP_PATH.'modules/imap/hm-ews.php';
+require_once APP_PATH.'modules/smtp/hm-smtp.php';
+require_once APP_PATH.'modules/core/hm-mailbox.php';
+
 /* get the stubs */
 require APP_PATH.'tests/phpunit/stubs.php';