From 99063a3f762fd9c389f6881b8069994f7ba05939 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Mon, 7 Jun 2010 10:46:28 -0700 Subject: [PATCH] Allow for cleanup of inbox messages in tests. --- t/Inbox.t | 6 +++--- t/lib/WebGUI/Test.pm | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/t/Inbox.t b/t/Inbox.t index 23a5d462b..3af427551 100644 --- a/t/Inbox.t +++ b/t/Inbox.t @@ -40,6 +40,7 @@ my $new_message = { }; my $message = $inbox->addMessage($new_message,{ no_email => 1, }); +WebGUI::Test->addToCleanup($message); isa_ok($message, 'WebGUI::Inbox::Message'); ok(defined($message), 'addMessage returned a response'); @@ -51,8 +52,8 @@ ok($messageId, 'messageId retrieved'); #################################### # get a message based on messageId # #################################### -$message = $inbox->getMessage($messageId); -ok($message->getId == $messageId, 'getMessage returns message object'); +my $messageCopy = $inbox->getMessage($messageId); +ok($messageCopy->getId == $messageId, 'getMessage returns message object'); ######################################################### # get a list (arrayref) of messages for a specific user # @@ -133,7 +134,6 @@ note $messages->[0]->isRead; is($inbox->getUnreadMessageCount($admin->userId), 3, '... really tracks unread messages'); END { - $session->db->write('delete from inbox where messageId = ?', [$message->getId]); foreach my $message (@{ $inbox->getMessagesForUser($admin, 1000) } ) { $message->setDeleted(3); $message->delete(3); diff --git a/t/lib/WebGUI/Test.pm b/t/lib/WebGUI/Test.pm index 454969d9f..b2cc425ce 100644 --- a/t/lib/WebGUI/Test.pm +++ b/t/lib/WebGUI/Test.pm @@ -799,6 +799,7 @@ were passed in. Currently able to destroy: WebGUI::Shop::AddressBook WebGUI::DatabaseLink WebGUI::LDAPLink + WebGUI::Inbox::Message Example call: @@ -887,6 +888,7 @@ Example call: 'WebGUI::Shop::Transaction' => 'delete', 'WebGUI::Shop::ShipDriver' => 'delete', 'WebGUI::Shop::PayDriver' => 'delete', + 'WebGUI::Inbox::Message' => 'purge', 'WebGUI::Shop::Cart' => sub { my $cart = shift; my $addressBook = $cart->getAddressBook();