From 585850230c22939951d84c4da535cdada76e2802 Mon Sep 17 00:00:00 2001
From: uwetews <uwe.tews@googlemail.com>
Date: Sat, 2 Jan 2016 04:56:22 +0100
Subject: [PATCH] update block plugin tests

---
 .../BlockPlugin/CompileBlockPluginTest.php    | 74 ++++---------------
 .../PHPunitplugins/block.nooutput.php         | 24 ++++++
 .../PHPunitplugins/block.testblock.php        |  7 +-
 .../TagTests/BlockPlugin/cache/dummy.txt      |  0
 .../TagTests/BlockPlugin/templates/assign.tpl |  1 +
 .../BlockPlugin/templates/blockplugintest.tpl |  1 -
 .../BlockPlugin/templates/no_assign.tpl       |  1 +
 .../BlockPlugin/templates/nooutput.tpl        |  1 +
 .../BlockPlugin/templates/registered.tpl      |  1 +
 .../TagTests/BlockPlugin/templates/repeat.tpl |  1 +
 .../BlockPlugin/templates/repeat_modifier.tpl |  1 +
 .../templates/repeat_modifier_2.tpl           |  1 +
 12 files changed, 50 insertions(+), 63 deletions(-)
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/BlockPlugin/PHPunitplugins/block.nooutput.php
 delete mode 100644 tests/UnitTests/TemplateSource/TagTests/BlockPlugin/cache/dummy.txt
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/assign.tpl
 delete mode 100644 tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/blockplugintest.tpl
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/no_assign.tpl
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/nooutput.tpl
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/registered.tpl
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/repeat.tpl
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/repeat_modifier.tpl
 create mode 100644 tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/repeat_modifier_2.tpl

diff --git a/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/CompileBlockPluginTest.php b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/CompileBlockPluginTest.php
index 726e4a0c..a0598631 100644
--- a/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/CompileBlockPluginTest.php
+++ b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/CompileBlockPluginTest.php
@@ -19,7 +19,6 @@ class CompileBlockPluginTest extends PHPUnit_Smarty
     {
         $this->setUpSmarty(dirname(__FILE__));
         $this->smarty->addPluginsDir("./PHPunitplugins/");
-        $this->smarty->setForceCompile(true);
         $this->smarty->disableSecurity();
     }
 
@@ -34,8 +33,7 @@ class CompileBlockPluginTest extends PHPUnit_Smarty
      */
     public function testBlockPluginNoAssign()
     {
-        $tpl = $this->smarty->createTemplate("eval:{textformat}hello world{/textformat}");
-        $this->assertEquals("hello world", $this->smarty->fetch($tpl));
+         $this->assertEquals("hello world", $this->smarty->fetch('no_assign.tpl'));
     }
 
     /**
@@ -44,51 +42,7 @@ class CompileBlockPluginTest extends PHPUnit_Smarty
      */
     public function testBlockPluginAssign()
     {
-        $tpl = $this->smarty->createTemplate("eval:{textformat assign=foo}hello world{/textformat}{\$foo}");
-        $this->assertEquals("hello world", $this->smarty->fetch($tpl));
-    }
-
-    /**
-     * test block plugin tag in template file
-     *
-     * @runInSeparateProcess
-     * @preserveGlobalState disabled
-     *
-     */
-    public function testBlockPluginFromTemplateFile()
-    {
-        $tpl = $this->smarty->createTemplate('blockplugintest.tpl');
-        $this->assertEquals("abc", $this->smarty->fetch($tpl));
-    }
-
-    /**
-     * test block plugin tag in compiled template file
-     *
-     * @runInSeparateProcess
-     * @preserveGlobalState disabled
-     *
-     */
-    public function testBlockPluginFromCompiledTemplateFile()
-    {
-        $this->smarty->setForceCompile(false);
-        $tpl = $this->smarty->createTemplate('blockplugintest.tpl');
-        $this->assertEquals("abc", $this->smarty->fetch($tpl));
-    }
-
-    /**
-     * test block plugin tag in template file
-     *
-     * @runInSeparateProcess
-     * @preserveGlobalState disabled
-     *
-     */
-    public function testBlockPluginFromTemplateFileCache()
-    {
-        $this->smarty->setForceCompile(false);
-        $this->smarty->caching = 1;
-        $this->smarty->cache_lifetime = 10;
-        $tpl = $this->smarty->createTemplate('blockplugintest.tpl');
-        $this->assertEquals("abc", $this->smarty->fetch($tpl));
+        $this->assertEquals("hello world", $this->smarty->fetch('assign.tpl'));
     }
 
     /**
@@ -101,8 +55,7 @@ class CompileBlockPluginTest extends PHPUnit_Smarty
     public function testBlockPluginRegisteredFunction()
     {
         $this->smarty->registerPlugin(Smarty::PLUGIN_BLOCK, 'blockplugintest', 'myblockplugintest');
-        $tpl = $this->smarty->createTemplate('eval:{blockplugintest}hello world{/blockplugintest}');
-        $this->assertEquals('block test', $this->smarty->fetch($tpl));
+        $this->assertEquals('block test', $this->smarty->fetch('registered.tpl'));
     }
 
     /**
@@ -111,28 +64,33 @@ class CompileBlockPluginTest extends PHPUnit_Smarty
      */
     public function testBlockPluginRepeat()
     {
-        $this->smarty->addPluginsDir(dirname(__FILE__) . "/PHPunitplugins/");
-        $this->assertEquals('12345', $this->smarty->fetch('eval:{testblock}{/testblock}'));
+        $this->assertEquals('12345', $this->smarty->fetch('repeat.tpl'));
     }
 
     /**
-     *
+     * test block plugin repeat function with modifier
      *
      */
     public function testBlockPluginRepeatModidier1()
     {
-        $this->smarty->addPluginsDir(dirname(__FILE__) . "/PHPunitplugins/");
-        $this->assertEquals('11111', $this->smarty->fetch('eval:{testblock}{/testblock|strlen}'));
+        $this->assertEquals('11111', $this->smarty->fetch('repeat_modifier.tpl'));
     }
 
     /**
-     *
+     * test block plugin repeat function with modifier list
      *
      */
     public function testBlockPluginRepeatModidier2()
     {
-        $this->smarty->addPluginsDir(dirname(__FILE__) . "/PHPunitplugins/");
-        $this->assertEquals('11111', $this->smarty->fetch('eval:{testblock}{/testblock|strlen|default:""}'));
+        $this->assertEquals('11111', $this->smarty->fetch('repeat_modifier_2.tpl'));
+    }
+    /**
+     * test block plugin with no output
+     *
+     */
+    public function testBlockPluginNoOutput()
+    {
+        $this->assertEquals('default', $this->smarty->fetch('nooutput.tpl'));
     }
 }
 
diff --git a/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/PHPunitplugins/block.nooutput.php b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/PHPunitplugins/block.nooutput.php
new file mode 100644
index 00000000..398c9a3b
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/PHPunitplugins/block.nooutput.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Smarty plugin for testing block plugins
+ *
+ * @package    Smarty
+ * @subpackage PHPunitPlugin
+ */
+
+/**
+ * Smarty {nooutput}{/nooutput} block plugin
+ *
+ * @param array       $params parameter array
+ * @param string $content  contents of the block
+ * @param object $template template object
+ * @param  bool      $repeat flag
+ *
+ * @return string content re-formatted
+ */
+function smarty_block_nooutput($params, $content, $template, &$repeat)
+{
+    if (isset($content)) {
+           $repeat = false;
+    }
+}
diff --git a/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/PHPunitplugins/block.testblock.php b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/PHPunitplugins/block.testblock.php
index 8a0aac2a..63f1108a 100644
--- a/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/PHPunitplugins/block.testblock.php
+++ b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/PHPunitplugins/block.testblock.php
@@ -9,10 +9,10 @@
 /**
  * Smarty {testblock}{/testblock} block plugin
  *
+ * @param array       $params parameter array
  * @param string $content  contents of the block
- * @param object $smarty   Smarty object
- * @param        boolean   $ &$repeat repeat flag
  * @param object $template template object
+ * @param  bool      $repeat flag
  *
  * @return string content re-formatted
  */
@@ -26,8 +26,7 @@ function smarty_block_testblock($params, $content, $template, &$repeat)
         } else {
             $repeat = false;
         }
-
-        return $loop;
+       return $loop;
     } else {
         $loop = 0;
     }
diff --git a/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/cache/dummy.txt b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/cache/dummy.txt
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/assign.tpl b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/assign.tpl
new file mode 100644
index 00000000..48273727
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/assign.tpl
@@ -0,0 +1 @@
+{textformat assign=foo}hello world{/textformat}{$foo}
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/blockplugintest.tpl b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/blockplugintest.tpl
deleted file mode 100644
index bf50ea37..00000000
--- a/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/blockplugintest.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{textformat}abc{/textformat}
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/no_assign.tpl b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/no_assign.tpl
new file mode 100644
index 00000000..4137bdf1
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/no_assign.tpl
@@ -0,0 +1 @@
+{textformat}hello world{/textformat}
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/nooutput.tpl b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/nooutput.tpl
new file mode 100644
index 00000000..f287b5aa
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/nooutput.tpl
@@ -0,0 +1 @@
+{nooutput}{/nooutput|default:'default'}
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/registered.tpl b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/registered.tpl
new file mode 100644
index 00000000..e7822da9
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/registered.tpl
@@ -0,0 +1 @@
+{blockplugintest}hello world{/blockplugintest}
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/repeat.tpl b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/repeat.tpl
new file mode 100644
index 00000000..32c39c0c
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/repeat.tpl
@@ -0,0 +1 @@
+{testblock}{/testblock}
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/repeat_modifier.tpl b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/repeat_modifier.tpl
new file mode 100644
index 00000000..831c95a5
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/repeat_modifier.tpl
@@ -0,0 +1 @@
+{testblock}{/testblock|strlen}
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/repeat_modifier_2.tpl b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/repeat_modifier_2.tpl
new file mode 100644
index 00000000..33031924
--- /dev/null
+++ b/tests/UnitTests/TemplateSource/TagTests/BlockPlugin/templates/repeat_modifier_2.tpl
@@ -0,0 +1 @@
+{testblock}{/testblock|strlen|default:''}
\ No newline at end of file