Revision: 18630 http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=18630 Author: johang Date: 2008-06-27 22:16:12 +0000 (Fri, 27 Jun 2008)
Log Message: ----------- More tests, fixed bug in replace. Modified Paths: -------------- trunk/calendar/inc/class.ipc_calendar.inc.php trunk/calendar/test/class.bocalendar_test.inc.php trunk/calendar/test/class.ipc_calendar_test.inc.php Modified: trunk/calendar/inc/class.ipc_calendar.inc.php =================================================================== --- trunk/calendar/inc/class.ipc_calendar.inc.php 2008-06-27 20:34:32 UTC (rev 18629) +++ trunk/calendar/inc/class.ipc_calendar.inc.php 2008-06-27 22:16:12 UTC (rev 18630) @@ -140,14 +140,17 @@ { $exists = $this->existData($id); - $internal_data['cal']['id'] = $id; + if($exists) + { + $internal_data['cal']['id'] = $id; + } - $this->bocalendar->update($internal_data); + $this->bocalendar->update($internal_data, false); return $exists; } - return FALSE; + return NULL; } /** Modified: trunk/calendar/test/class.bocalendar_test.inc.php =================================================================== --- trunk/calendar/test/class.bocalendar_test.inc.php 2008-06-27 20:34:32 UTC (rev 18629) +++ trunk/calendar/test/class.bocalendar_test.inc.php 2008-06-27 22:16:12 UTC (rev 18630) @@ -67,19 +67,18 @@ function setup() { - $this->to_be_deleted = array(); - } - - function teardown() - { - foreach($this->to_be_deleted as $d) + foreach($this->bocalendar->list_events(0, 0, 0) as $id) { - $this->bocalendar->delete_entry($d); + $this->bocalendar->delete_entry($id); } $this->bocalendar->expunge(); } + function teardown() + { + } + function test_save_and_get() { $this->bocalendar->update($this->sample_item, false); @@ -96,8 +95,6 @@ $this->sample_item['cal']['title'], $data['title']); $this->assertEqual( $this->sample_item['cal']['description'], $data['description']); - - $this->to_be_deleted[] = $id; } /** @@ -132,8 +129,6 @@ sort($id_list_after); $this->assertEqual($id_list_after, $id_list_expected_after); - - $this->to_be_deleted[] = $a; } function test_delete() @@ -152,8 +147,6 @@ $this->assertEqual( $this->bocalendar->read_entry($id), array()); - - $this->to_be_deleted[] = $id; } function test_exists() Modified: trunk/calendar/test/class.ipc_calendar_test.inc.php =================================================================== --- trunk/calendar/test/class.ipc_calendar_test.inc.php 2008-06-27 20:34:32 UTC (rev 18629) +++ trunk/calendar/test/class.ipc_calendar_test.inc.php 2008-06-27 22:16:12 UTC (rev 18630) @@ -27,7 +27,7 @@ { private $ipc; - private $sample_ical; + private $sample_ical = ''; private $sample_item = array( 'cal' => array( @@ -128,18 +128,60 @@ function test_replaceData() { + $id = $this->ipc->addData($this->sample_item, + "application/x-phpgw-calendar"); + + $this->assertTrue(is_array($this->ipc->getData($id, + "application/x-phpgw-calendar"))); + + $new_item = $this->sample_item; + $new_item['cal']['description'] = "replaced description"; + + // @todo test when replacing item that not already exists + + $this->assertTrue($this->ipc->replaceData($id, + $new_item, "application/x-phpgw-calendar")); + + $data = $this->ipc->getData($id, "application/x-phpgw-calendar"); + + $this->assertEqual($data["description"], "replaced description"); + + // @todo test more properties } function test_existData() { + $id = $this->ipc->addData($this->sample_item, + "application/x-phpgw-calendar"); + + $this->assertTrue($this->ipc->existData($id)); + + $this->ipc->removeData($id); + + $this->assertFalse($this->ipc->existData($id)); } function test_convertData_from_ical_1() { + $converted_data = $this->ipc->convertData( + $this->sample_ical, "text/x-vcalendar", + "application/x-phpgw-calendar"); + + $this->assertEqual($converted_data["title"], "TITLE!"); + + // @todo test more properties } function test_convertData_to_ical_1() { + $converted_data = $this->ipc->convertData( + $this->sample_item, "application/x-phpgw-calendar", + "text/x-vcalendar"); + + $this->assertTrue(strpos($converted_data, + 'SUMMARY:TITLE!')); + + // @todo test more properties } } ?> _______________________________________________ phpGroupWare-cvs mailing list phpGroupWare-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/phpgroupware-cvs