From: <an...@us...> - 2007-04-05 00:57:42
|
Revision: 16229 http://svn.sourceforge.net/gallery/?rev=16229&view=rev Author: andy_st Date: 2007-04-04 17:57:13 -0700 (Wed, 04 Apr 2007) Log Message: ----------- Fix test, use public methods which also ensure that the template_c folder exists. Modified Paths: -------------- trunk/gallery2/modules/imageframe/test/phpunit/ImageFrameTest.class Modified: trunk/gallery2/modules/imageframe/test/phpunit/ImageFrameTest.class =================================================================== --- trunk/gallery2/modules/imageframe/test/phpunit/ImageFrameTest.class 2007-04-04 19:25:45 UTC (rev 16228) +++ trunk/gallery2/modules/imageframe/test/phpunit/ImageFrameTest.class 2007-04-05 00:57:13 UTC (rev 16229) @@ -110,21 +110,19 @@ * not in $smarty so we can use it. This unit test verifies this behavior * (in case it changes in a future version of smarty). */ - $smarty1 = GalleryTemplate::_getSmarty(true); - $smarty2 = GalleryTemplate::_getSmarty(true); - $smarty1->template_dir = dirname(dirname(__FILE__)); - $smarty2->template_dir = dirname(dirname(__FILE__)); + $template1 = new GalleryTemplate(dirname(dirname(__FILE__)), true, true); + $template2 = new GalleryTemplate(dirname(dirname(__FILE__)), true, true); /* Verify these are separate instances */ - $smarty1->assign('foo', 'bar'); - $smarty2->assign('foo', 'hoho'); - $this->assertEquals('bar', $smarty1->get_template_vars('foo')); + $template1->setVariable('foo', 'bar'); + $template2->setVariable('foo', 'hoho'); + $this->assertEquals('bar', $template1->getVariable('foo')); /* Verify {counter} works across smarty instances */ - $result = $smarty1->fetch('gallery:data/counter.tpl'); + $result = $template1->fetch('gallery:data/counter.tpl'); $result[1] = trim($result[1]); $this->assertEquals(array(null, '1'), $result); - $result = $smarty2->fetch('gallery:data/counter.tpl'); + $result = $template2->fetch('gallery:data/counter.tpl'); $result[1] = trim($result[1]); $this->assertEquals(array(null, '2'), $result); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |