From 680b17407a599dced5eb57e9a6467ee36d4f68b8 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 6 Oct 2012 14:06:30 +0100
Subject: fixed sidebar test and renamed it to reflect recent changes

---
 _test/tests/inc/template_include_page.test.php | 40 ++++++++++++++++++++++++++
 _test/tests/inc/template_sidebar.test.php      | 40 --------------------------
 2 files changed, 40 insertions(+), 40 deletions(-)
 create mode 100644 _test/tests/inc/template_include_page.test.php
 delete mode 100644 _test/tests/inc/template_sidebar.test.php

(limited to '_test')

diff --git a/_test/tests/inc/template_include_page.test.php b/_test/tests/inc/template_include_page.test.php
new file mode 100644
index 000000000..47d4d46f1
--- /dev/null
+++ b/_test/tests/inc/template_include_page.test.php
@@ -0,0 +1,40 @@
+<?php
+
+class template_include_page_test extends DokuWikiTest {
+    function testNoSidebar() {
+        global $ID;
+
+        $ID = 'foo:bar:baz:test';
+        $sidebar = tpl_include_page('sidebar', false, true);
+        $this->assertEquals('', $sidebar);
+    }
+
+    function testExistingSidebars() {
+        global $ID;
+
+        saveWikiText('sidebar', 'topsidebar-test', '');
+
+        $ID = 'foo:bar:baz:test';
+        $sidebar = tpl_include_page('sidebar', false, true);
+        $this->assertTrue(strpos($sidebar, 'topsidebar-test') > 0);
+
+        $ID = 'foo';
+        $sidebar = tpl_include_page('sidebar', false, true);
+        $this->assertTrue(strpos($sidebar, 'topsidebar-test') > 0);
+
+        saveWikiText('foo:bar:sidebar', 'bottomsidebar-test', '');
+
+        $ID = 'foo:bar:baz:test';
+        $sidebar = tpl_include_page('sidebar', false, true);
+        $this->assertTrue(strpos($sidebar, 'bottomsidebar-test') > 0);
+
+        $ID = 'foo:bar:test';
+        $sidebar = tpl_include_page('sidebar', false, true);
+        $this->assertTrue(strpos($sidebar, 'bottomsidebar-test') > 0);
+
+        $ID = 'foo';
+        $sidebar = tpl_include_page('sidebar', false, true);
+        $this->assertTrue(strpos($sidebar, 'topsidebar-test') > 0);
+    }
+
+}
diff --git a/_test/tests/inc/template_sidebar.test.php b/_test/tests/inc/template_sidebar.test.php
deleted file mode 100644
index 56153894a..000000000
--- a/_test/tests/inc/template_sidebar.test.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-class template_sidebar_test extends DokuWikiTest {
-    function testNoSidebar() {
-        global $ID;
-
-        $ID = 'foo:bar:baz:test';
-        $sidebar = tpl_sidebar(false);
-        $this->assertEquals('',$sidebar);
-    }
-
-    function testExistingSidebars() {
-        global $ID;
-
-        saveWikiText('sidebar', 'topsidebar-test', '');
-
-        $ID = 'foo:bar:baz:test';
-        $sidebar = tpl_sidebar(false);
-        $this->assertTrue(strpos($sidebar, 'topsidebar-test') > 0);
-
-        $ID = 'foo';
-        $sidebar = tpl_sidebar(false);
-        $this->assertTrue(strpos($sidebar, 'topsidebar-test') > 0);
-
-        saveWikiText('foo:bar:sidebar', 'bottomsidebar-test', '');
-
-        $ID = 'foo:bar:baz:test';
-        $sidebar = tpl_sidebar(false);
-        $this->assertTrue(strpos($sidebar, 'bottomsidebar-test') > 0);
-
-        $ID = 'foo:bar:test';
-        $sidebar = tpl_sidebar(false);
-        $this->assertTrue(strpos($sidebar, 'bottomsidebar-test') > 0);
-
-        $ID = 'foo';
-        $sidebar = tpl_sidebar(false);
-        $this->assertTrue(strpos($sidebar, 'topsidebar-test') > 0);
-    }
-
-}
-- 
cgit v1.2.3