[limb-svn] r6388 - in 3.x/trunk/limb/macro/tests: bench bench/tpl cases

[svn at limb-project.com]

Author: pachanga
Date: 2007-10-06 01:04:49 +0400 (Sat, 06 Oct 2007)
New Revision: 6388
URL: http://fisheye.limb-project.com/changelog/limb/?cs=6388

Modified:
   3.x/trunk/limb/macro/tests/bench/macro.php
   3.x/trunk/limb/macro/tests/bench/tpl/macro.phtml
   3.x/trunk/limb/macro/tests/bench/wact.php
   3.x/trunk/limb/macro/tests/cases/lmbMacroTagAcceptanceTest.class.php
Log:
-- bench tests can accept template file name and variables to be passed into template using key=value format
-- improving unit tests a bit


Modified: 3.x/trunk/limb/macro/tests/bench/macro.php
===================================================================
--- 3.x/trunk/limb/macro/tests/bench/macro.php	2007-10-05 14:35:40 UTC (rev 6387)
+++ 3.x/trunk/limb/macro/tests/bench/macro.php	2007-10-05 21:04:49 UTC (rev 6388)
@@ -1,15 +1,25 @@
 <?php
 
+if(!isset($argv[1]))
+  die("\nTemplate argument is required\n");
+$file = $argv[1];
+
 set_include_path(dirname(__FILE__) . '/../../../../');
 require_once('limb/core/common.inc.php');
 require_once('limb/macro/src/lmbMacroTemplate.class.php');
 
+$tpl = new lmbMacroTemplate($file, new lmbMacroConfig('/tmp/macro', false, false, array(dirname(__FILE__) . '/tpl')));
+
+for($i=2;$i<$argc;$i++)
+{
+  list($key, $value) = explode('=', $argv[$i]);
+  $tpl->set($key, $value);
+}
+
 include('start.inc.php');
 
 for($i=0;$i<1000;$i++)
 {
-  $tpl = new lmbMacroTemplate('macro.phtml', new lmbMacroConfig('/tmp/macro', false, false, array(dirname(__FILE__) . '/tpl')));
-  $tpl->set('name', 'Bob');
   $tpl->render();
 }
 

Modified: 3.x/trunk/limb/macro/tests/bench/tpl/macro.phtml
===================================================================
--- 3.x/trunk/limb/macro/tests/bench/tpl/macro.phtml	2007-10-05 14:35:40 UTC (rev 6387)
+++ 3.x/trunk/limb/macro/tests/bench/tpl/macro.phtml	2007-10-05 21:04:49 UTC (rev 6388)
@@ -1 +1 @@
-Hello, {{$#name}}!
+Hello, {$#name}!

Modified: 3.x/trunk/limb/macro/tests/bench/wact.php
===================================================================
--- 3.x/trunk/limb/macro/tests/bench/wact.php	2007-10-05 14:35:40 UTC (rev 6387)
+++ 3.x/trunk/limb/macro/tests/bench/wact.php	2007-10-05 21:04:49 UTC (rev 6388)
@@ -1,5 +1,9 @@
 <?php
 
+if(!isset($argv[1]))
+  die("\nTemplate argument is required\n");
+$file = $argv[1];
+
 set_include_path(dirname(__FILE__) . '/../../../../');
 define('WACT_CACHE_DIR', '/tmp/wact');
 define('WACT_TPLS', dirname(__FILE__) . '/tpl');
@@ -7,12 +11,18 @@
 require_once('limb/wact/src/WactTemplate.class.php');
 require_once('limb/wact/src/WactDefaultTemplateConfig.class.php');
 
+$tpl = new WactTemplate($file, new WactDefaultTemplateConfig(dirname(__FILE__) . '/settings/wact.ini'));
+
+for($i=2;$i<$argc;$i++)
+{
+  list($key, $value) = explode('=', $argv[$i]);
+  $tpl->set($key, $value);
+}
+
 include('start.inc.php');
 
 for($i=0;$i<1000;$i++)
 {
-  $tpl = new WactTemplate('wact.html', new WactDefaultTemplateConfig(dirname(__FILE__) . '/settings/wact.ini'));
-  $tpl->set('name', 'Bob');
   $tpl->capture();
 }
 

Modified: 3.x/trunk/limb/macro/tests/cases/lmbMacroTagAcceptanceTest.class.php
===================================================================
--- 3.x/trunk/limb/macro/tests/cases/lmbMacroTagAcceptanceTest.class.php	2007-10-05 14:35:40 UTC (rev 6387)
+++ 3.x/trunk/limb/macro/tests/cases/lmbMacroTagAcceptanceTest.class.php	2007-10-05 21:04:49 UTC (rev 6388)
@@ -58,11 +58,12 @@
 
   function testCompositeTagAttributes()
   {
-    $code = '<h1>{{zoo attr="Test_{$#var}"/}}</h1>';
+    $code = '<h1>{{zoo attr="Test_{$#var}_{$#foo}"/}}</h1>';
     $tpl = $this->_createMacroTemplate($code, 'tpl.html');
     $tpl->set('var', 'Result');
+    $tpl->set('foo', 'Attribute');
     $out = $tpl->render();
-    $this->assertEqual($out, '<h1>Test_Result</h1>');
+    $this->assertEqual($out, '<h1>Test_Result_Attribute</h1>');
   }
 }