[Phpgroupware-cvs] [18643] Updated IPC testcase for calendar.

[Johan Gunnarsson]

Revision: 18643
          
http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=18643
Author:   johang
Date:     2008-07-13 22:48:01 +0000 (Sun, 13 Jul 2008)

Log Message:
-----------
Updated IPC testcase for calendar.

Modified Paths:
--------------
    trunk/calendar/test/class.ipc_calendar_test.inc.php

Modified: trunk/calendar/test/class.ipc_calendar_test.inc.php
===================================================================
--- trunk/calendar/test/class.ipc_calendar_test.inc.php 2008-07-11 12:39:02 UTC 
(rev 18642)
+++ trunk/calendar/test/class.ipc_calendar_test.inc.php 2008-07-13 22:48:01 UTC 
(rev 18643)
@@ -106,8 +106,6 @@
 
                        $this->assertEqual($data['title'],
                                $this->sample_item['cal']['title']);
-
-                       $this->to_be_deleted[] = $id;
                }
 
                function test_getIdList()
@@ -121,8 +119,6 @@
 
                        $this->assertEqual($id_list_after,
                                array_merge($id_list_before, array($a)));
-
-                       $this->to_be_deleted[] = $a;
                }
 
                function test_getIdList_with_lastmod()
@@ -130,16 +126,19 @@
                        $now = time();
 
                        $this->assertEqual($this->ipc->getIdlist($now + 10), 
array());
+                       $this->assertEqual($this->ipc->getIdlist($now), 
array());
                        $this->assertEqual($this->ipc->getIdlist($now - 10), 
array());
 
                        $a = $this->ipc->addData($this->sample_item,
                                "application/x-phpgw-calendar");
 
                        $id_list_plus10 = $this->ipc->getIdlist($now + 10);
+                       $id_list_now = $this->ipc->getIdlist($now);
                        $id_list_minus10 = $this->ipc->getIdlist($now - 10);
 
+                       $this->assertEqual($id_list_plus10, array());
+                       $this->assertEqual($id_list_now, array());
                        $this->assertEqual($id_list_minus10, array($a));
-                       $this->assertEqual($id_list_plus10, array());
                }
 
                function test_removeData()
@@ -154,11 +153,9 @@
 
                        $this->assertFalse($this->ipc->getData($id,
                                "application/x-phpgw-calendar"));
-
-                       $this->to_be_deleted[] = $id;
                }
 
-               function test_replaceData()
+               function test_replaceData_replace()
                {
                        $id = $this->ipc->addData($this->sample_item,
                                "application/x-phpgw-calendar");
@@ -171,9 +168,12 @@
 
                        // @todo test when replacing item that not already 
exists
 
-                       $this->assertTrue($this->ipc->replaceData($id,
-                               $new_item, "application/x-phpgw-calendar"));
+                       $new_id = $this->ipc->replaceData($id,
+                               $new_item, "application/x-phpgw-calendar");
 
+                       $this->assertTrue($new_id);
+                       $this->assertEqual($new_id, $id);
+
                        $data = $this->ipc->getData($id, 
"application/x-phpgw-calendar");
 
                        $this->assertEqual($data["description"], "replaced 
description");
@@ -181,6 +181,27 @@
                        // @todo test more properties
                }
 
+               function test_replaceData_add()
+               {
+                       $id = 100000;
+
+                       $this->assertFalse($this->ipc->existData($id));
+
+                       $new_id = $this->ipc->replaceData($id,
+                               $this->sample_item, 
'application/x-phpgw-calendar');
+
+                       $this->assertTrue($new_id);
+                       $this->assertNotEqual($new_id, $id);
+
+                       $data = $this->ipc->getData($new_id,
+                               'application/x-phpgw-calendar');
+
+                       $this->assertEqual($data['title'],
+                               $this->sample_item['cal']['title']);
+
+                       // @todo test more properties
+               }
+
                function test_existData()
                {
                        $id = $this->ipc->addData($this->sample_item,