Complete Horde_Alarm tests.

diff --git a/framework/Alarm/test/Horde/Alarm/001.phpt b/framework/Alarm/test/Horde/Alarm/001.phpt
deleted file mode 100644 (file)
index 993b0ff..0000000
--- a/framework/Alarm/test/Horde/Alarm/001.phpt
+++ /dev/null
@@ -1,487 +0,0 @@
---TEST--
-Horde_Alarm tests.
---SKIPIF--
-<?php
-$setup = @include dirname(__FILE__) . '/setup.inc';
-if (!$setup || empty($params)) {
-    echo 'skip No SQL configuration provided.';
-}
-?>
---FILE--
-<?php
-
-include dirname(__FILE__) . '/setup.inc';
-require dirname(__FILE__) . '/../../../lib/Horde/Alarm.php';
-require 'Horde.php';
-require 'Horde/Nls.php';
-
-$alarm = Horde_Alarm::factory('sql', $params);
-
-$now = time();
-$date = new Horde_Date($now);
-$end = new Horde_Date($now + 3600);
-$hash = array('id' => 'personalalarm',
-              'user' => 'john',
-              'start' => $date,
-              'end' => $end,
-              'methods' => array(),
-              'params' => array(),
-              'title' => 'This is a personal alarm.');
-
-var_dump($alarm->set($hash));
-var_dump($alarm->exists('personalalarm', 'john'));
-$saved = $alarm->get('personalalarm', 'john');
-var_dump($saved);
-var_dump($saved['start']->compareDateTime($date));
-$hash['title'] = 'Changed alarm text';
-var_dump($alarm->set($hash));
-$date->min--;
-$alarm->set(array('id' => 'publicalarm',
-                  'start' => $date,
-                  'end' => $end,
-                  'methods' => array(),
-                  'params' => array(),
-                  'title' => 'This is a public alarm.'));
-var_dump($alarm->listAlarms('john'));
-var_dump($alarm->delete('publicalarm', ''));
-var_dump($alarm->listAlarms('john'));
-$error = $alarm->snooze('personalalarm', 'jane', 30);
-var_dump($error->getMessage());
-var_dump($alarm->snooze('personalalarm', 'john', 30));
-var_dump($alarm->isSnoozed('personalalarm', 'john'));
-var_dump($alarm->listAlarms('john'));
-var_dump($alarm->listAlarms('john', $end));
-var_dump($alarm->set(array('id' => 'noend',
-                           'user' => 'john',
-                           'start' => $date,
-                           'methods' => array('notify'),
-                           'params' => array(),
-                           'title' => 'This is an alarm without end.')));
-var_dump($alarm->listAlarms('john', $end));
-var_dump($alarm->delete('noend', 'john'));
-var_dump($alarm->delete('personalalarm', 'john'));
-
-?>
---EXPECTF--
-int(1)
-bool(true)
-array(10) {
-  ["id"]=>
-  string(13) "personalalarm"
-  ["user"]=>
-  string(4) "john"
-  ["start"]=>
-  object(horde_date)(7) {
-    ["year"]=>
-    int(%d%d%d%d)
-    ["month"]=>
-    int(%d)
-    ["mday"]=>
-    int(%d)
-    ["hour"]=>
-    int(%d)
-    ["min"]=>
-    int(%d)
-    ["sec"]=>
-    int(%d)
-    ["_supportedSpecs"]=>
-    string(21) "%CdDeHImMnRStTyYbBpxX"
-  }
-  ["end"]=>
-  object(horde_date)(7) {
-    ["year"]=>
-    int(%d%d%d%d)
-    ["month"]=>
-    int(%d)
-    ["mday"]=>
-    int(%d)
-    ["hour"]=>
-    int(%d)
-    ["min"]=>
-    int(%d)
-    ["sec"]=>
-    int(%d)
-    ["_supportedSpecs"]=>
-    string(21) "%CdDeHImMnRStTyYbBpxX"
-  }
-  ["methods"]=>
-  array(0) {
-  }
-  ["params"]=>
-  array(0) {
-  }
-  ["title"]=>
-  string(25) "This is a personal alarm."
-  ["text"]=>
-  NULL
-  ["snooze"]=>
-  NULL
-  ["internal"]=>
-  NULL
-}
-int(0)
-int(1)
-array(2) {
-  [0]=>
-  array(10) {
-    ["id"]=>
-    string(11) "publicalarm"
-    ["user"]=>
-    string(0) ""
-    ["start"]=>
-    object(horde_date)(7) {
-      ["year"]=>
-      int(%d%d%d%d)
-      ["month"]=>
-      int(%d)
-      ["mday"]=>
-      int(%d)
-      ["hour"]=>
-      int(%d)
-      ["min"]=>
-      int(%d)
-      ["sec"]=>
-      int(%d)
-      ["_supportedSpecs"]=>
-      string(21) "%CdDeHImMnRStTyYbBpxX"
-    }
-    ["end"]=>
-    object(horde_date)(7) {
-      ["year"]=>
-      int(%d%d%d%d)
-      ["month"]=>
-      int(%d)
-      ["mday"]=>
-      int(%d)
-      ["hour"]=>
-      int(%d)
-      ["min"]=>
-      int(%d)
-      ["sec"]=>
-      int(%d)
-      ["_supportedSpecs"]=>
-      string(21) "%CdDeHImMnRStTyYbBpxX"
-    }
-    ["methods"]=>
-    array(0) {
-    }
-    ["params"]=>
-    array(0) {
-    }
-    ["title"]=>
-    string(23) "This is a public alarm."
-    ["text"]=>
-    NULL
-    ["snooze"]=>
-    NULL
-    ["internal"]=>
-    NULL
-  }
-  [1]=>
-  array(10) {
-    ["id"]=>
-    string(13) "personalalarm"
-    ["user"]=>
-    string(4) "john"
-    ["start"]=>
-    object(horde_date)(7) {
-      ["year"]=>
-      int(%d%d%d%d)
-      ["month"]=>
-      int(%d)
-      ["mday"]=>
-      int(%d)
-      ["hour"]=>
-      int(%d)
-      ["min"]=>
-      int(%d)
-      ["sec"]=>
-      int(%d)
-      ["_supportedSpecs"]=>
-      string(21) "%CdDeHImMnRStTyYbBpxX"
-    }
-    ["end"]=>
-    object(horde_date)(7) {
-      ["year"]=>
-      int(%d%d%d%d)
-      ["month"]=>
-      int(%d)
-      ["mday"]=>
-      int(%d)
-      ["hour"]=>
-      int(%d)
-      ["min"]=>
-      int(%d)
-      ["sec"]=>
-      int(%d)
-      ["_supportedSpecs"]=>
-      string(21) "%CdDeHImMnRStTyYbBpxX"
-    }
-    ["methods"]=>
-    array(0) {
-    }
-    ["params"]=>
-    array(0) {
-    }
-    ["title"]=>
-    string(18) "Changed alarm text"
-    ["text"]=>
-    NULL
-    ["snooze"]=>
-    NULL
-    ["internal"]=>
-    NULL
-  }
-}
-int(1)
-array(1) {
-  [0]=>
-  array(10) {
-    ["id"]=>
-    string(13) "personalalarm"
-    ["user"]=>
-    string(4) "john"
-    ["start"]=>
-    object(horde_date)(7) {
-      ["year"]=>
-      int(%d%d%d%d)
-      ["month"]=>
-      int(%d)
-      ["mday"]=>
-      int(%d)
-      ["hour"]=>
-      int(%d)
-      ["min"]=>
-      int(%d)
-      ["sec"]=>
-      int(%d)
-      ["_supportedSpecs"]=>
-      string(21) "%CdDeHImMnRStTyYbBpxX"
-    }
-    ["end"]=>
-    object(horde_date)(7) {
-      ["year"]=>
-      int(%d%d%d%d)
-      ["month"]=>
-      int(%d)
-      ["mday"]=>
-      int(%d)
-      ["hour"]=>
-      int(%d)
-      ["min"]=>
-      int(%d)
-      ["sec"]=>
-      int(%d)
-      ["_supportedSpecs"]=>
-      string(21) "%CdDeHImMnRStTyYbBpxX"
-    }
-    ["methods"]=>
-    array(0) {
-    }
-    ["params"]=>
-    array(0) {
-    }
-    ["title"]=>
-    string(18) "Changed alarm text"
-    ["text"]=>
-    NULL
-    ["snooze"]=>
-    NULL
-    ["internal"]=>
-    NULL
-  }
-}
-string(15) "Alarm not found"
-int(1)
-bool(true)
-array(0) {
-}
-array(1) {
-  [0]=>
-  array(10) {
-    ["id"]=>
-    string(13) "personalalarm"
-    ["user"]=>
-    string(4) "john"
-    ["start"]=>
-    object(horde_date)(7) {
-      ["year"]=>
-      int(%d%d%d%d)
-      ["month"]=>
-      int(%d)
-      ["mday"]=>
-      int(%d)
-      ["hour"]=>
-      int(%d)
-      ["min"]=>
-      int(%d)
-      ["sec"]=>
-      int(%d)
-      ["_supportedSpecs"]=>
-      string(21) "%CdDeHImMnRStTyYbBpxX"
-    }
-    ["end"]=>
-    object(horde_date)(7) {
-      ["year"]=>
-      int(%d%d%d%d)
-      ["month"]=>
-      int(%d)
-      ["mday"]=>
-      int(%d)
-      ["hour"]=>
-      int(%d)
-      ["min"]=>
-      int(%d)
-      ["sec"]=>
-      int(%d)
-      ["_supportedSpecs"]=>
-      string(21) "%CdDeHImMnRStTyYbBpxX"
-    }
-    ["methods"]=>
-    array(0) {
-    }
-    ["params"]=>
-    array(0) {
-    }
-    ["title"]=>
-    string(18) "Changed alarm text"
-    ["text"]=>
-    NULL
-    ["snooze"]=>
-    object(horde_date)(7) {
-      ["year"]=>
-      int(%d%d%d%d)
-      ["month"]=>
-      int(%d)
-      ["mday"]=>
-      int(%d)
-      ["hour"]=>
-      int(%d)
-      ["min"]=>
-      int(%d)
-      ["sec"]=>
-      int(%d)
-      ["_supportedSpecs"]=>
-      string(21) "%CdDeHImMnRStTyYbBpxX"
-    }
-    ["internal"]=>
-    NULL
-  }
-}
-int(1)
-array(2) {
-  [0]=>
-  array(10) {
-    ["id"]=>
-    string(5) "noend"
-    ["user"]=>
-    string(4) "john"
-    ["start"]=>
-    object(horde_date)(7) {
-      ["year"]=>
-      int(%d%d%d%d)
-      ["month"]=>
-      int(%d)
-      ["mday"]=>
-      int(%d)
-      ["hour"]=>
-      int(%d)
-      ["min"]=>
-      int(%d)
-      ["sec"]=>
-      int(%d)
-      ["_supportedSpecs"]=>
-      string(21) "%CdDeHImMnRStTyYbBpxX"
-    }
-    ["end"]=>
-    NULL
-    ["methods"]=>
-    array(1) {
-      [0]=>
-      string(6) "notify"
-    }
-    ["params"]=>
-    array(0) {
-    }
-    ["title"]=>
-    string(29) "This is an alarm without end."
-    ["text"]=>
-    NULL
-    ["snooze"]=>
-    NULL
-    ["internal"]=>
-    NULL
-  }
-  [1]=>
-  array(10) {
-    ["id"]=>
-    string(13) "personalalarm"
-    ["user"]=>
-    string(4) "john"
-    ["start"]=>
-    object(horde_date)(7) {
-      ["year"]=>
-      int(%d%d%d%d)
-      ["month"]=>
-      int(%d)
-      ["mday"]=>
-      int(%d)
-      ["hour"]=>
-      int(%d)
-      ["min"]=>
-      int(%d)
-      ["sec"]=>
-      int(%d)
-      ["_supportedSpecs"]=>
-      string(21) "%CdDeHImMnRStTyYbBpxX"
-    }
-    ["end"]=>
-    object(horde_date)(7) {
-      ["year"]=>
-      int(%d%d%d%d)
-      ["month"]=>
-      int(%d)
-      ["mday"]=>
-      int(%d)
-      ["hour"]=>
-      int(%d)
-      ["min"]=>
-      int(%d)
-      ["sec"]=>
-      int(%d)
-      ["_supportedSpecs"]=>
-      string(21) "%CdDeHImMnRStTyYbBpxX"
-    }
-    ["methods"]=>
-    array(0) {
-    }
-    ["params"]=>
-    array(0) {
-    }
-    ["title"]=>
-    string(18) "Changed alarm text"
-    ["text"]=>
-    NULL
-    ["snooze"]=>
-    object(horde_date)(7) {
-      ["year"]=>
-      int(%d%d%d%d)
-      ["month"]=>
-      int(%d)
-      ["mday"]=>
-      int(%d)
-      ["hour"]=>
-      int(%d)
-      ["min"]=>
-      int(%d)
-      ["sec"]=>
-      int(%d)
-      ["_supportedSpecs"]=>
-      string(21) "%CdDeHImMnRStTyYbBpxX"
-    }
-    ["internal"]=>
-    NULL
-  }
-}
-int(1)
-int(1)

diff --git a/framework/Alarm/test/Horde/Alarm/SqlTest.php b/framework/Alarm/test/Horde/Alarm/SqlTest.php
index 589fdfa..69103f7 100644 (file)
--- a/framework/Alarm/test/Horde/Alarm/SqlTest.php
+++ b/framework/Alarm/test/Horde/Alarm/SqlTest.php
@@ -12,6 +12,8 @@ class Horde_Alarm_SqlTest extends PHPUnit_Framework_TestCase
     protected static $db;
     protected static $migrator;
     protected static $alarm;
+    protected static $date;
+    protected static $end;
 
     public static function setUpBeforeClass()
     {
@@ -52,12 +54,12 @@ class Horde_Alarm_SqlTest extends PHPUnit_Framework_TestCase
     public function testSet()
     {
         $now = time();
-        $date = new Horde_Date($now);
-        $end = new Horde_Date($now + 3600);
+        self::$date = new Horde_Date($now);
+        self::$end = new Horde_Date($now + 3600);
         $hash = array('id' => 'personalalarm',
                       'user' => 'john',
-                      'start' => $date,
-                      'end' => $end,
+                      'start' => self::$date,
+                      'end' => self::$end,
                       'methods' => array(),
                       'params' => array(),
                       'title' => 'This is a personal alarm.');
@@ -71,4 +73,112 @@ class Horde_Alarm_SqlTest extends PHPUnit_Framework_TestCase
     {
         $this->assertTrue(self::$alarm->exists('personalalarm', 'john'));
     }
+
+    /**
+     * @depends testExists
+     */
+    public function testGet()
+    {
+        $alarm = self::$alarm->get('personalalarm', 'john');
+        $this->assertType('array', $alarm);
+        $this->assertEquals('personalalarm', $alarm['id']);
+        $this->assertEquals('john', $alarm['user']);
+        $this->assertEquals(array(), $alarm['methods']);
+        $this->assertEquals(array(), $alarm['params']);
+        $this->assertEquals('This is a personal alarm.', $alarm['title']);
+        $this->assertNull($alarm['text']);
+        $this->assertNull($alarm['snooze']);
+        $this->assertNull($alarm['internal']);
+        $this->assertTrue($alarm['start'] instanceof Horde_Date);
+        $this->assertTrue($alarm['end'] instanceof Horde_Date);
+        $this->assertEquals(0, $alarm['start']->compareDateTime(self::$date));
+        return $alarm;
+    }
+
+    /**
+     * @depends testGet
+     */
+    public function testUpdate($alarm)
+    {
+        $alarm['title'] = 'Changed alarm text';
+        self::$alarm->set($alarm);
+    }
+
+    /**
+     * @depends testUpdate
+     */
+    public function testListAlarms()
+    {
+        self::$date->min--;
+        self::$alarm->set(array('id' => 'publicalarm',
+                                'start' => self::$date,
+                                'end' => self::$end,
+                                'methods' => array(),
+                                'params' => array(),
+                                'title' => 'This is a public alarm.'));
+        $list = self::$alarm->listAlarms('john');
+        $this->assertEquals(2, count($list));
+        $this->assertEquals('publicalarm', $list[0]['id']);
+        $this->assertEquals('personalalarm', $list[1]['id']);
+    }
+
+    /**
+     * @depends testListAlarms
+     */
+    public function testDelete()
+    {
+        self::$alarm->delete('publicalarm', '');
+        $list = self::$alarm->listAlarms('john');
+        $this->assertEquals(1, count($list));
+        $this->assertEquals('personalalarm', $list[0]['id']);
+    }
+
+    /**
+     * @depends testDelete
+     * @expectedException Horde_Alarm_Exception
+     */
+    public function testSnoozeException()
+    {
+        self::$alarm->snooze('personalalarm', 'jane', 30);
+    }
+
+    /**
+     * @depends testDelete
+     */
+    public function testSnooze()
+    {
+        self::$alarm->snooze('personalalarm', 'john', 30);
+        $this->assertTrue(self::$alarm->isSnoozed('personalalarm', 'john'));
+        $list = self::$alarm->listAlarms('john');
+        $this->assertEquals(0, count($list));
+        $list = self::$alarm->listAlarms('john', self::$end);
+        $this->assertEquals(1, count($list));
+        $this->assertEquals('personalalarm', $list[0]['id']);
+    }
+
+    /**
+     * @depends testSnooze
+     */
+    public function testAlarmWithoutEnd()
+    {
+        self::$alarm->set(array('id' => 'noend',
+                                'user' => 'john',
+                                'start' => self::$date,
+                                'methods' => array('notify'),
+                                'params' => array(),
+                                'title' => 'This is an alarm without end.'));
+        $list = self::$alarm->listAlarms('john', self::$end);
+        $this->assertEquals(2, count($list));
+        $this->assertEquals('noend', $list[0]['id']);
+        $this->assertEquals('personalalarm', $list[1]['id']);
+    }
+
+    /**
+     * @depends testAlarmWithoutEnd
+     */
+    public function testCleanUp()
+    {
+        self::$alarm->delete('noend', 'john');
+        self::$alarm->delete('personalalarm', 'john');
+    }
 }

diff --git a/framework/Alarm/test/Horde/Alarm/setup.inc.dist b/framework/Alarm/test/Horde/Alarm/setup.inc.dist
deleted file mode 100644 (file)
index 0fa5e51..0000000
--- a/framework/Alarm/test/Horde/Alarm/setup.inc.dist
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$params = array('phptype' => 'mysql',
-                'database' => 'horde',
-                'username' => 'horde',
-                'password' => 'horde',
-                'charset' => 'iso-8859-1');
-
-$conf['log'] = array('priority' => 'DEBUG',
-                     'ident' => 'HORDE',
-                     'params' => array('append' => true),
-                     'name' => '/tmp/horde.log',
-                     'type' => 'file',
-                     'enabled' => true);