diff --git a/tests/UnitTests/ResourceTests/Extends/ExtendsResourceTest.php b/tests/UnitTests/ResourceTests/Extends/ExtendsResourceTest.php
index 0494ead0..e3816d12 100644
--- a/tests/UnitTests/ResourceTests/Extends/ExtendsResourceTest.php
+++ b/tests/UnitTests/ResourceTests/Extends/ExtendsResourceTest.php
@@ -91,6 +91,23 @@ class ExtendsResourceTest extends PHPUnit_Smarty
$this->assertStringContainsString("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result, $testName . ' - fetch() failure');
}
+ /**
+ * @dataProvider data
+ */
+ public function testCompileBlockIncreaseInChild_050($caching, $merge, $testNumber, $compileTestNumber, $renderTestNumber, $testName)
+ {
+ $this->smarty->registerFilter('pre', array($this, 'compiledPrefilter'));
+ $this->smarty->assign('test', $testNumber);
+ $this->smarty->caching = $caching;
+ $this->smarty->merge_compiled_includes = $merge;
+ if ($merge) {
+ $this->smarty->compile_id = 1;
+ }
+ $result = $this->smarty->fetch('extends:050_parent.tpl|050_child.tpl|050_grandchild.tpl');
+ $this->assertStringContainsString("var-bar-var", $result, $testName . ' - content');
+ $this->assertStringContainsString("test:{$testNumber} compiled:{$compileTestNumber} rendered:{$renderTestNumber}", $result, $testName . ' - fetch() failure');
+ }
+
/**
* test grandchild/child/parent dependency test1
* @runInSeparateProcess
@@ -259,7 +276,7 @@ class ExtendsResourceTest extends PHPUnit_Smarty
*/
array(false, false, 1, 1, 1, 'no caching, no merge - new'),
array(false, false, 2, 1, 2, 'no caching, no merge - exits'),
- array(true, false, 3, 3, 3, 'caching, no merge - new'),
+ array(true, false, 3, 3, 3, 'caching, no merge - new'), // 2
array(true, false, 4, 3, 3, 'caching, no merge - exits'),
array(false, true, 5, 5, 5, 'no caching, merge - new'),
array(false, true, 6, 5, 6, 'no caching, merge - exits'),
diff --git a/tests/UnitTests/ResourceTests/Extends/templates/050_child.tpl b/tests/UnitTests/ResourceTests/Extends/templates/050_child.tpl
new file mode 100644
index 00000000..887c4ad5
--- /dev/null
+++ b/tests/UnitTests/ResourceTests/Extends/templates/050_child.tpl
@@ -0,0 +1 @@
+{$notfoo="notbar"}
diff --git a/tests/UnitTests/ResourceTests/Extends/templates/050_grandchild.tpl b/tests/UnitTests/ResourceTests/Extends/templates/050_grandchild.tpl
new file mode 100644
index 00000000..2f8199de
--- /dev/null
+++ b/tests/UnitTests/ResourceTests/Extends/templates/050_grandchild.tpl
@@ -0,0 +1 @@
+{$foo="bar"}
diff --git a/tests/UnitTests/ResourceTests/Extends/templates/050_parent.tpl b/tests/UnitTests/ResourceTests/Extends/templates/050_parent.tpl
new file mode 100644
index 00000000..85d2795a
--- /dev/null
+++ b/tests/UnitTests/ResourceTests/Extends/templates/050_parent.tpl
@@ -0,0 +1,2 @@
+test:{$test nocache} compiled:# rendered:{$test}
+{block name='test'}var-{$foo}-var{/block}
diff --git a/tests/UnitTests/TemplateSource/TagTests/TemplateFunction/templates/CachingTests/nocache_lib.tpl b/tests/UnitTests/TemplateSource/TagTests/TemplateFunction/templates/CachingTests/nocache_lib.tpl
deleted file mode 100644
index 8602140e..00000000
--- a/tests/UnitTests/TemplateSource/TagTests/TemplateFunction/templates/CachingTests/nocache_lib.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-{function 'nocache1' default1='d1' default2='d2'}
- default1={$default1}
- default2={$default1 nocache}
- p1={$p1}
- p2={$p2 nocache}
-{/function}
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/TemplateFunction/templates/CachingTests/test0.tpl b/tests/UnitTests/TemplateSource/TagTests/TemplateFunction/templates/CachingTests/test0.tpl
deleted file mode 100644
index ae27c661..00000000
--- a/tests/UnitTests/TemplateSource/TagTests/TemplateFunction/templates/CachingTests/test0.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-Test 1
-
-{include 'test7.tpl' compile_id = 4}
-
diff --git a/tests/UnitTests/TemplateSource/TagTests/TemplateFunction/templates/CachingTests/test1.tpl b/tests/UnitTests/TemplateSource/TagTests/TemplateFunction/templates/CachingTests/test1.tpl
deleted file mode 100644
index c8992cca..00000000
--- a/tests/UnitTests/TemplateSource/TagTests/TemplateFunction/templates/CachingTests/test1.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-Test 1
-
-{include 'test7.tpl' compile_id = $id}
-{include 'test6.tpl'}
-{include file="test2.tpl"}
-{include 'test6.tpl'}
-
diff --git a/tests/UnitTests/TemplateSource/TagTests/TemplateFunction/templates/CachingTests/test2.tpl b/tests/UnitTests/TemplateSource/TagTests/TemplateFunction/templates/CachingTests/test2.tpl
deleted file mode 100644
index 9b526949..00000000
--- a/tests/UnitTests/TemplateSource/TagTests/TemplateFunction/templates/CachingTests/test2.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-Test 2
-
-{include file="test3.tpl" compile_id=4}
diff --git a/tests/UnitTests/TemplateSource/TagTests/TemplateFunction/templates/CachingTests/test3.tpl b/tests/UnitTests/TemplateSource/TagTests/TemplateFunction/templates/CachingTests/test3.tpl
deleted file mode 100644
index c4ca3221..00000000
--- a/tests/UnitTests/TemplateSource/TagTests/TemplateFunction/templates/CachingTests/test3.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-Test 3 {call name='f' nocache}
-
-{include file="test4.tpl" compile_id=9}
-{include file="test5.tpl" cache_id="7"}
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/TemplateFunction/templates/CachingTests/test4.tpl b/tests/UnitTests/TemplateSource/TagTests/TemplateFunction/templates/CachingTests/test4.tpl
deleted file mode 100644
index 13b0cbbb..00000000
--- a/tests/UnitTests/TemplateSource/TagTests/TemplateFunction/templates/CachingTests/test4.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-Test 4
-
-{include file="test5.tpl" cache_id="7"}
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/TemplateFunction/templates/CachingTests/test5.tpl b/tests/UnitTests/TemplateSource/TagTests/TemplateFunction/templates/CachingTests/test5.tpl
deleted file mode 100644
index 0a65c4c8..00000000
--- a/tests/UnitTests/TemplateSource/TagTests/TemplateFunction/templates/CachingTests/test5.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-test 5
-
-
-{call 'f'}
diff --git a/tests/UnitTests/TemplateSource/TagTests/TemplateFunction/templates/CachingTests/test6.tpl b/tests/UnitTests/TemplateSource/TagTests/TemplateFunction/templates/CachingTests/test6.tpl
deleted file mode 100644
index d7379f81..00000000
--- a/tests/UnitTests/TemplateSource/TagTests/TemplateFunction/templates/CachingTests/test6.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-test 6
-
-{function name='f'}
-
- function f {$id} {$foo}
-
-{/function}
-
Time 6 = {$t6}
\ No newline at end of file
diff --git a/tests/UnitTests/TemplateSource/TagTests/TemplateFunction/templates/CachingTests/test7.tpl b/tests/UnitTests/TemplateSource/TagTests/TemplateFunction/templates/CachingTests/test7.tpl
deleted file mode 100644
index cc378526..00000000
--- a/tests/UnitTests/TemplateSource/TagTests/TemplateFunction/templates/CachingTests/test7.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-test 7
-
extern
\ No newline at end of file