r4128 - trunk/plugins/ullMailPlugin/test/unit

0 views
Skip to first unread message

s...@ull.at

unread,
Jul 7, 2014, 4:47:46 AM7/7/14
to ullrigh...@googlegroups.com
Author: klemens
Date: 2014-07-07 10:47:45 +0200 (Mon, 07 Jul 2014)
New Revision: 4128

Modified:
trunk/plugins/ullMailPlugin/test/unit/UllNewsletterLayoutTest.php
trunk/plugins/ullMailPlugin/test/unit/UllNewsletterMailingListTableTest.php
Log:
Fixed tests

Modified: trunk/plugins/ullMailPlugin/test/unit/UllNewsletterLayoutTest.php
===================================================================
--- trunk/plugins/ullMailPlugin/test/unit/UllNewsletterLayoutTest.php 2014-07-07 07:25:28 UTC (rev 4127)
+++ trunk/plugins/ullMailPlugin/test/unit/UllNewsletterLayoutTest.php 2014-07-07 08:47:45 UTC (rev 4128)
@@ -5,7 +5,7 @@
// create context since it is required by ->getUser() etc.
sfContext::createInstance($configuration);

-$t = new sfDoctrineTestCase(5, new lime_output_color, $configuration);
+$t = new sfDoctrineTestCase(6, new lime_output_color, $configuration);
$path = dirname(__FILE__);
$t->setFixturesPath($path);

@@ -21,7 +21,8 @@
$layoutTwo->html_body = '<html><body>test two</body></html>';
$layoutTwo->save();

- $t->is(PluginUllNewsletterLayoutTable::getDefaultId(), false, 'There isn\'t a default layout');
+ $t->is($layoutOne->is_default, false, 'Layout one is not default');
+ $t->is($layoutTwo->is_default, false, 'and layout two neither');

$t->diag('set layouts as default');
$layoutOne->is_default = true;
@@ -29,7 +30,6 @@

$t->is(PluginUllNewsletterLayoutTable::getDefaultId(), $layoutOne->id, 'Layout one is default');

-
$layoutTwo->is_default = true;
$layoutTwo->save();


Modified: trunk/plugins/ullMailPlugin/test/unit/UllNewsletterMailingListTableTest.php
===================================================================
--- trunk/plugins/ullMailPlugin/test/unit/UllNewsletterMailingListTableTest.php 2014-07-07 07:25:28 UTC (rev 4127)
+++ trunk/plugins/ullMailPlugin/test/unit/UllNewsletterMailingListTableTest.php 2014-07-07 08:47:45 UTC (rev 4128)
@@ -5,40 +5,16 @@
// create context since it is required by ->getUser() etc.
sfContext::createInstance($configuration);

-$t = new sfDoctrineTestCase(5, new lime_output_color, $configuration);
+$t = new sfDoctrineTestCase(2, new lime_output_color, $configuration);
$path = dirname(__FILE__);
$t->setFixturesPath($path);


$t->begin('getSubscribedByDefaultIds()');
- $t->is(UllNewsletterMailingListTable::getSubscribedByDefaultIds(), array(101), 'Returns the correct ids');
+ $t->is(UllNewsletterMailingListTable::getSubscribedByDefaultIds(), array(101),
+ 'Returns the correct ids');


$t->diag('getDefaultIds()');
- $listOne = new UllNewsletterMailingList();
- $listOne->name = 'testListOne';
- $listOne->save();
-
- $listTwo = new UllNewsletterMailingList();
- $listTwo->name = 'testListTwo';
- $listTwo->save();
-
- $t->is(PluginUllNewsletterMailingListTable::getDefaultIds(), array(), 'There isn\'t a default list');
-
-$t->diag('set lists as default');
- $listOne->is_default = true;
- $listOne->save();
-
- $t->is(PluginUllNewsletterMailingListTable::getDefaultIds(), array($listOne->id), 'List one is default');
-
-
- $listTwo->is_default = true;
- $listTwo->save();
-
- $t->is(PluginUllNewsletterMailingListTable::getDefaultIds(), array($listOne->id, $listTwo->id), 'Both are default');
-
-
- $listOne->is_default = false;
- $listOne->save();
-
- $t->is(PluginUllNewsletterMailingListTable::getDefaultIds(), array($listTwo->id), 'List two is default');
\ No newline at end of file
+ $t->is(PluginUllNewsletterMailingListTable::getDefaultIds(), array(101),
+ 'Returns the correct ids');

Reply all
Reply to author
Forward
0 new messages