From e66d3e6dfa7ba6f0cf55b58f0b00b66b52c98321 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 1 Jul 2012 11:41:22 +0200
Subject: Improved sidebar inclusion

Template authors now can use tpl_sidebar() to include the sidebar.
Sidebars can be defined in subnamespaces as well
---
 _test/tests/inc/pageutils_findnearest.test.php | 40 ++++++++++++++++++++++++++
 _test/tests/inc/template_sidebar.test.php      | 40 ++++++++++++++++++++++++++
 2 files changed, 80 insertions(+)
 create mode 100644 _test/tests/inc/pageutils_findnearest.test.php
 create mode 100644 _test/tests/inc/template_sidebar.test.php

(limited to '_test')

diff --git a/_test/tests/inc/pageutils_findnearest.test.php b/_test/tests/inc/pageutils_findnearest.test.php
new file mode 100644
index 000000000..e129b5e58
--- /dev/null
+++ b/_test/tests/inc/pageutils_findnearest.test.php
@@ -0,0 +1,40 @@
+<?php
+
+class pageutils_findnearest_test extends DokuWikiTest {
+    function testNoSidebar() {
+        global $ID;
+
+        $ID = 'foo:bar:baz:test';
+        $sidebar = page_findnearest('sidebar');
+        $this->assertEquals(false, $sidebar);
+    }
+
+    function testExistingSidebars() {
+        global $ID;
+
+        saveWikiText('sidebar', 'topsidebar-test', '');
+
+        $ID = 'foo:bar:baz:test';
+        $sidebar = page_findnearest('sidebar');
+        $this->assertEquals('sidebar', $sidebar);
+
+        $ID = 'foo';
+        $sidebar = page_findnearest('sidebar');
+        $this->assertEquals('sidebar', $sidebar);
+
+        saveWikiText('foo:bar:sidebar', 'bottomsidebar-test', '');
+
+        $ID = 'foo:bar:baz:test';
+        $sidebar = page_findnearest('sidebar');
+        $this->assertEquals('foo:bar:sidebar', $sidebar);
+
+        $ID = 'foo:bar:test';
+        $sidebar = page_findnearest('sidebar');
+        $this->assertEquals('foo:bar:sidebar', $sidebar);
+
+        $ID = 'foo';
+        $sidebar = page_findnearest('sidebar');
+        $this->assertEquals('sidebar', $sidebar);
+    }
+
+}
diff --git a/_test/tests/inc/template_sidebar.test.php b/_test/tests/inc/template_sidebar.test.php
new file mode 100644
index 000000000..56153894a
--- /dev/null
+++ b/_test/tests/inc/template_sidebar.test.php
@@ -0,0 +1,40 @@
+<?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