From: Michael J. Rubinsky <mrubinsk@horde.org>
Date: Thu, 26 Feb 2009 19:47:26 +0000 (-0500)
Subject: Update tests to reflect the expected *.html.php template and layout
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=089b6af22df818828850c47edb49ef7ab31dfc04;p=horde.git

Update tests to reflect the expected *.html.php template and layout
filenames.
---

diff --git a/framework/View/test/Horde/View/BaseTest.php b/framework/View/test/Horde/View/BaseTest.php
index 5d4f72a11..9b175cbd7 100644
--- a/framework/View/test/Horde/View/BaseTest.php
+++ b/framework/View/test/Horde/View/BaseTest.php
@@ -88,7 +88,7 @@ class Horde_View_BaseTest extends Horde_Test_Case
         $this->_view->myVar = 'test';
 
         $expected = "<div>test</div>";
-        $this->assertEquals($expected, $this->_view->render('testRender.html'));
+        $this->assertEquals($expected, $this->_view->render('testRender.html.php'));
     }
 
     // test rendering
diff --git a/framework/View/test/Horde/View/fixtures/_myPartial.html b/framework/View/test/Horde/View/fixtures/_myPartial.html
deleted file mode 100644
index f374d0e0e..000000000
--- a/framework/View/test/Horde/View/fixtures/_myPartial.html
+++ /dev/null
@@ -1 +0,0 @@
-<p><?= $this->myVar2 ?></p>
\ No newline at end of file
diff --git a/framework/View/test/Horde/View/fixtures/_myPartial.html.php b/framework/View/test/Horde/View/fixtures/_myPartial.html.php
new file mode 100644
index 000000000..f374d0e0e
--- /dev/null
+++ b/framework/View/test/Horde/View/fixtures/_myPartial.html.php
@@ -0,0 +1 @@
+<p><?= $this->myVar2 ?></p>
\ No newline at end of file
diff --git a/framework/View/test/Horde/View/fixtures/_myPartialLocals.html b/framework/View/test/Horde/View/fixtures/_myPartialLocals.html
deleted file mode 100644
index 74607ebb8..000000000
--- a/framework/View/test/Horde/View/fixtures/_myPartialLocals.html
+++ /dev/null
@@ -1 +0,0 @@
-<p><?= $a ?> <?= $b ?></p>
\ No newline at end of file
diff --git a/framework/View/test/Horde/View/fixtures/_myPartialLocals.html.php b/framework/View/test/Horde/View/fixtures/_myPartialLocals.html.php
new file mode 100644
index 000000000..74607ebb8
--- /dev/null
+++ b/framework/View/test/Horde/View/fixtures/_myPartialLocals.html.php
@@ -0,0 +1 @@
+<p><?= $a ?> <?= $b ?></p>
\ No newline at end of file
diff --git a/framework/View/test/Horde/View/fixtures/_myPartialObject.html b/framework/View/test/Horde/View/fixtures/_myPartialObject.html
deleted file mode 100644
index e2db662fb..000000000
--- a/framework/View/test/Horde/View/fixtures/_myPartialObject.html
+++ /dev/null
@@ -1 +0,0 @@
-<p><?= $myPartialObject->string_value ?></p>
\ No newline at end of file
diff --git a/framework/View/test/Horde/View/fixtures/_myPartialObject.html.php b/framework/View/test/Horde/View/fixtures/_myPartialObject.html.php
new file mode 100644
index 000000000..e2db662fb
--- /dev/null
+++ b/framework/View/test/Horde/View/fixtures/_myPartialObject.html.php
@@ -0,0 +1 @@
+<p><?= $myPartialObject->string_value ?></p>
\ No newline at end of file
diff --git a/framework/View/test/Horde/View/fixtures/subdir/testRender.html b/framework/View/test/Horde/View/fixtures/subdir/testRender.html
deleted file mode 100644
index 5ecca9358..000000000
--- a/framework/View/test/Horde/View/fixtures/subdir/testRender.html
+++ /dev/null
@@ -1 +0,0 @@
-<div>subdir <?= $this->myVar ?></div>
\ No newline at end of file
diff --git a/framework/View/test/Horde/View/fixtures/subdir/testRender.html.php b/framework/View/test/Horde/View/fixtures/subdir/testRender.html.php
new file mode 100644
index 000000000..5ecca9358
--- /dev/null
+++ b/framework/View/test/Horde/View/fixtures/subdir/testRender.html.php
@@ -0,0 +1 @@
+<div>subdir <?= $this->myVar ?></div>
\ No newline at end of file
diff --git a/framework/View/test/Horde/View/fixtures/testEscape.html b/framework/View/test/Horde/View/fixtures/testEscape.html
deleted file mode 100644
index f56541960..000000000
--- a/framework/View/test/Horde/View/fixtures/testEscape.html
+++ /dev/null
@@ -1 +0,0 @@
-<div>test <?= $this->h($this->myVar) ?> quotes</div>
\ No newline at end of file
diff --git a/framework/View/test/Horde/View/fixtures/testEscape.html.php b/framework/View/test/Horde/View/fixtures/testEscape.html.php
new file mode 100644
index 000000000..f56541960
--- /dev/null
+++ b/framework/View/test/Horde/View/fixtures/testEscape.html.php
@@ -0,0 +1 @@
+<div>test <?= $this->h($this->myVar) ?> quotes</div>
\ No newline at end of file
diff --git a/framework/View/test/Horde/View/fixtures/testPartial.html b/framework/View/test/Horde/View/fixtures/testPartial.html
deleted file mode 100644
index bbf96b6dd..000000000
--- a/framework/View/test/Horde/View/fixtures/testPartial.html
+++ /dev/null
@@ -1 +0,0 @@
-<div><?= @$this->myVar1 ?><?= $this->renderPartial('myPartial') ?></div>
\ No newline at end of file
diff --git a/framework/View/test/Horde/View/fixtures/testPartial.html.php b/framework/View/test/Horde/View/fixtures/testPartial.html.php
new file mode 100644
index 000000000..bbf96b6dd
--- /dev/null
+++ b/framework/View/test/Horde/View/fixtures/testPartial.html.php
@@ -0,0 +1 @@
+<div><?= @$this->myVar1 ?><?= $this->renderPartial('myPartial') ?></div>
\ No newline at end of file
diff --git a/framework/View/test/Horde/View/fixtures/testPartialCollection.html b/framework/View/test/Horde/View/fixtures/testPartialCollection.html
deleted file mode 100644
index cc3b3a417..000000000
--- a/framework/View/test/Horde/View/fixtures/testPartialCollection.html
+++ /dev/null
@@ -1 +0,0 @@
-<div><?= $this->renderPartial('myPartialObject', array('collection' => $this->myObjects)) ?></div>
\ No newline at end of file
diff --git a/framework/View/test/Horde/View/fixtures/testPartialCollection.html.php b/framework/View/test/Horde/View/fixtures/testPartialCollection.html.php
new file mode 100644
index 000000000..cc3b3a417
--- /dev/null
+++ b/framework/View/test/Horde/View/fixtures/testPartialCollection.html.php
@@ -0,0 +1 @@
+<div><?= $this->renderPartial('myPartialObject', array('collection' => $this->myObjects)) ?></div>
\ No newline at end of file
diff --git a/framework/View/test/Horde/View/fixtures/testPartialLocals.html b/framework/View/test/Horde/View/fixtures/testPartialLocals.html
deleted file mode 100644
index e6cc6446f..000000000
--- a/framework/View/test/Horde/View/fixtures/testPartialLocals.html
+++ /dev/null
@@ -1 +0,0 @@
-<div><?= $this->renderPartial('myPartialLocals', array('locals' => array('a' => 'hello', 'b' => 'world'))) ?></div>
\ No newline at end of file
diff --git a/framework/View/test/Horde/View/fixtures/testPartialLocals.html.php b/framework/View/test/Horde/View/fixtures/testPartialLocals.html.php
new file mode 100644
index 000000000..e6cc6446f
--- /dev/null
+++ b/framework/View/test/Horde/View/fixtures/testPartialLocals.html.php
@@ -0,0 +1 @@
+<div><?= $this->renderPartial('myPartialLocals', array('locals' => array('a' => 'hello', 'b' => 'world'))) ?></div>
\ No newline at end of file
diff --git a/framework/View/test/Horde/View/fixtures/testPartialObject.html b/framework/View/test/Horde/View/fixtures/testPartialObject.html
deleted file mode 100644
index d61d7ec42..000000000
--- a/framework/View/test/Horde/View/fixtures/testPartialObject.html
+++ /dev/null
@@ -1 +0,0 @@
-<div><?= $this->renderPartial('myPartialObject', array('object' => $this->myObject)) ?></div>
\ No newline at end of file
diff --git a/framework/View/test/Horde/View/fixtures/testPartialObject.html.php b/framework/View/test/Horde/View/fixtures/testPartialObject.html.php
new file mode 100644
index 000000000..d61d7ec42
--- /dev/null
+++ b/framework/View/test/Horde/View/fixtures/testPartialObject.html.php
@@ -0,0 +1 @@
+<div><?= $this->renderPartial('myPartialObject', array('object' => $this->myObject)) ?></div>
\ No newline at end of file
diff --git a/framework/View/test/Horde/View/fixtures/testRender.html b/framework/View/test/Horde/View/fixtures/testRender.html
deleted file mode 100644
index b764885ee..000000000
--- a/framework/View/test/Horde/View/fixtures/testRender.html
+++ /dev/null
@@ -1 +0,0 @@
-<div><?= $this->myVar ?></div>
\ No newline at end of file
diff --git a/framework/View/test/Horde/View/fixtures/testRender.html.php b/framework/View/test/Horde/View/fixtures/testRender.html.php
new file mode 100644
index 000000000..b764885ee
--- /dev/null
+++ b/framework/View/test/Horde/View/fixtures/testRender.html.php
@@ -0,0 +1 @@
+<div><?= $this->myVar ?></div>
\ No newline at end of file