From a0f18578e28576cf8f6e277460d6851e4e854915 Mon Sep 17 00:00:00 2001
From: Uwe Tews <uwe.tews@googlemail.com>
Date: Tue, 7 Jul 2015 00:49:20 +0200
Subject: [PATCH] Update file resource tests

---
 .../File/templates_2/ambiguous/case1/foobar.tpl           | 1 -
 .../ResourceTests/File/templates_2/helloworld.php         | 1 -
 .../ResourceTests/File/templates_3/extendsall.tpl         | 5 -----
 .../ResourceTests/File/templates_4/extendsall.tpl         | 3 ---
 .../FileResourceIndexedTest.php}                          | 8 ++++++--
 .../ResourceTests/FileIndexed/templates/dirname.tpl       | 1 +
 .../{File => FileIndexed}/templates_2/dirname.tpl         | 0
 .../{File => FileIndexed}/templates_3/dirname.tpl         | 0
 .../{File => FileIndexed}/templates_4/dirname.tpl         | 0
 9 files changed, 7 insertions(+), 12 deletions(-)
 delete mode 100644 tests/UnitTests/ResourceTests/File/templates_2/ambiguous/case1/foobar.tpl
 delete mode 100644 tests/UnitTests/ResourceTests/File/templates_2/helloworld.php
 delete mode 100644 tests/UnitTests/ResourceTests/File/templates_3/extendsall.tpl
 delete mode 100644 tests/UnitTests/ResourceTests/File/templates_4/extendsall.tpl
 rename tests/UnitTests/ResourceTests/{File/IndexedFileResourceTest.php => FileIndexed/FileResourceIndexedTest.php} (95%)
 create mode 100644 tests/UnitTests/ResourceTests/FileIndexed/templates/dirname.tpl
 rename tests/UnitTests/ResourceTests/{File => FileIndexed}/templates_2/dirname.tpl (100%)
 rename tests/UnitTests/ResourceTests/{File => FileIndexed}/templates_3/dirname.tpl (100%)
 rename tests/UnitTests/ResourceTests/{File => FileIndexed}/templates_4/dirname.tpl (100%)

diff --git a/tests/UnitTests/ResourceTests/File/templates_2/ambiguous/case1/foobar.tpl b/tests/UnitTests/ResourceTests/File/templates_2/ambiguous/case1/foobar.tpl
deleted file mode 100644
index b6e9ce55..00000000
--- a/tests/UnitTests/ResourceTests/File/templates_2/ambiguous/case1/foobar.tpl
+++ /dev/null
@@ -1 +0,0 @@
-templates_2
\ No newline at end of file
diff --git a/tests/UnitTests/ResourceTests/File/templates_2/helloworld.php b/tests/UnitTests/ResourceTests/File/templates_2/helloworld.php
deleted file mode 100644
index 6fe5b4ba..00000000
--- a/tests/UnitTests/ResourceTests/File/templates_2/helloworld.php
+++ /dev/null
@@ -1 +0,0 @@
-php hello world
diff --git a/tests/UnitTests/ResourceTests/File/templates_3/extendsall.tpl b/tests/UnitTests/ResourceTests/File/templates_3/extendsall.tpl
deleted file mode 100644
index 0b79019d..00000000
--- a/tests/UnitTests/ResourceTests/File/templates_3/extendsall.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-{block name="alpha"}templates_3{/block}
-{block name="bravo"}
-    {block name="bravo_1"}templates_3{/block}
-    {block name="bravo_2"}templates_3{/block}
-{/block}
\ No newline at end of file
diff --git a/tests/UnitTests/ResourceTests/File/templates_4/extendsall.tpl b/tests/UnitTests/ResourceTests/File/templates_4/extendsall.tpl
deleted file mode 100644
index 93557dca..00000000
--- a/tests/UnitTests/ResourceTests/File/templates_4/extendsall.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-{block name="alpha"}templates_4{/block}
-{block name="bravo"}templates_4{/block}
-{block name="charlie"}templates_4{/block}
\ No newline at end of file
diff --git a/tests/UnitTests/ResourceTests/File/IndexedFileResourceTest.php b/tests/UnitTests/ResourceTests/FileIndexed/FileResourceIndexedTest.php
similarity index 95%
rename from tests/UnitTests/ResourceTests/File/IndexedFileResourceTest.php
rename to tests/UnitTests/ResourceTests/FileIndexed/FileResourceIndexedTest.php
index 7a4460de..18067bcb 100644
--- a/tests/UnitTests/ResourceTests/File/IndexedFileResourceTest.php
+++ b/tests/UnitTests/ResourceTests/FileIndexed/FileResourceIndexedTest.php
@@ -7,7 +7,7 @@
  * @author                 Rodney Rehm
  * @backupStaticAttributes enabled
  */
-class IndexedFileResourceTest extends PHPUnit_Smarty
+class FileResourceIndexedTest extends PHPUnit_Smarty
 {
     public function setUp()
     {
@@ -16,8 +16,12 @@ class IndexedFileResourceTest extends PHPUnit_Smarty
         // note that 10 is a string!
         $this->smarty->addTemplateDir(__DIR__ . '/templates_3', '10');
         $this->smarty->addTemplateDir(__DIR__ . '/templates_4', 'foo');
-    }
+     }
 
+    public function testInit()
+    {
+        $this->cleanDirs();
+    }
 
     public function testGetTemplateFilepath()
     {
diff --git a/tests/UnitTests/ResourceTests/FileIndexed/templates/dirname.tpl b/tests/UnitTests/ResourceTests/FileIndexed/templates/dirname.tpl
new file mode 100644
index 00000000..f10e14ab
--- /dev/null
+++ b/tests/UnitTests/ResourceTests/FileIndexed/templates/dirname.tpl
@@ -0,0 +1 @@
+templates
\ No newline at end of file
diff --git a/tests/UnitTests/ResourceTests/File/templates_2/dirname.tpl b/tests/UnitTests/ResourceTests/FileIndexed/templates_2/dirname.tpl
similarity index 100%
rename from tests/UnitTests/ResourceTests/File/templates_2/dirname.tpl
rename to tests/UnitTests/ResourceTests/FileIndexed/templates_2/dirname.tpl
diff --git a/tests/UnitTests/ResourceTests/File/templates_3/dirname.tpl b/tests/UnitTests/ResourceTests/FileIndexed/templates_3/dirname.tpl
similarity index 100%
rename from tests/UnitTests/ResourceTests/File/templates_3/dirname.tpl
rename to tests/UnitTests/ResourceTests/FileIndexed/templates_3/dirname.tpl
diff --git a/tests/UnitTests/ResourceTests/File/templates_4/dirname.tpl b/tests/UnitTests/ResourceTests/FileIndexed/templates_4/dirname.tpl
similarity index 100%
rename from tests/UnitTests/ResourceTests/File/templates_4/dirname.tpl
rename to tests/UnitTests/ResourceTests/FileIndexed/templates_4/dirname.tpl