cs

diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Connector/Importer.php b/framework/ActiveSync/lib/Horde/ActiveSync/Connector/Importer.php
index c268350..71e7140 100644 (file)
--- a/framework/ActiveSync/lib/Horde/ActiveSync/Connector/Importer.php
+++ b/framework/ActiveSync/lib/Horde/ActiveSync/Connector/Importer.php
@@ -163,7 +163,7 @@ class Horde_ActiveSync_Connector_Importer
         }
 
         /* Tell backend about the deletion */
-        $this->_backend->DeleteMessage($this->_folderId, $id);
+        $this->_backend->deleteMessage($this->_folderId, $id);
 
         return true;
     }

diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Base.php b/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Base.php
index 4754435..3e5cf06 100644 (file)
--- a/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Base.php
+++ b/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Base.php
@@ -243,7 +243,7 @@ abstract class Horde_ActiveSync_Driver_Base
      *
      * @return boolean
      */
-    abstract public function DeleteMessage($folderid, $id);
+    abstract public function deleteMessage($folderid, $id);
 
     /**
      * Change (i.e. add or edit) a message on the backend

diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Horde.php b/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Horde.php
index ddcd477..79cbe24 100644 (file)
--- a/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Horde.php
+++ b/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Horde.php
@@ -332,11 +332,11 @@ class Horde_ActiveSync_Driver_Horde extends Horde_ActiveSync_Driver_Base
     /**
      * Delete a message
      *
-     * @see framework/ActiveSync/lib/Horde/ActiveSync/Driver/Horde_ActiveSync_Driver_Base#DeleteMessage($folderid, $id)
+     * @see framework/ActiveSync/lib/Horde/ActiveSync/Driver/Horde_ActiveSync_Driver_Base#deleteMessage($folderid, $id)
      */
-    public function DeleteMessage($folderid, $id)
+    public function deleteMessage($folderid, $id)
     {
-        $this->_logger->debug('Horde::DeleteMessage(' . $folderid . ', ' . $id . ')');
+        $this->_logger->debug('Horde::deleteMessage(' . $folderid . ', ' . $id . ')');
 
         $status = false;
         switch ($folderid) {

diff --git a/framework/ActiveSync/test/Horde/ActiveSync/HordeDriverTest.php b/framework/ActiveSync/test/Horde/ActiveSync/HordeDriverTest.php
index a6a98ef..9dcaf88 100644 (file)
--- a/framework/ActiveSync/test/Horde/ActiveSync/HordeDriverTest.php
+++ b/framework/ActiveSync/test/Horde/ActiveSync/HordeDriverTest.php
@@ -77,7 +77,6 @@ class Horde_ActiveSync_HordeDriverTest extends Horde_Test_Case
                                                           'state_basic' => $state));
 
         /* Contacts */
-        $results = $driver->getMessageList('Contacts', time());
         //$expected = array(
         //    array('id' => '20070112030603.249j42k3k068@test.theupstairsroom.com',
         //          'mod' => 0,
@@ -86,6 +85,7 @@ class Horde_ActiveSync_HordeDriverTest extends Horde_Test_Case
         //          'mod' => 0,
         //          'flags' => 1)
         //);
+        $results = $driver->getMessageList('Contacts', time());
         $this->assertEquals(2, count($results));
         foreach ($results as $result) {
             if ($result['id'] != '20070112030603.249j42k3k068@test.theupstairsroom.com') {
@@ -185,9 +185,9 @@ class Horde_ActiveSync_HordeDriverTest extends Horde_Test_Case
                 ->method('contacts_replace')
                 ->will($this->returnValue(2));
 
-        $connector->expects($this->at(1))
+        $connector->expects($this->once())
                 ->method('contacts_getActionTimestamp')
-                ->will($this->returnValue(array('todo')));
+                ->will($this->returnValue(0));
 
         /* TODO: appointments and todos */