--- a/tests/test_resolver.py	Mon Mar 10 16:47:21 2014 -0700
+++ b/tests/test_resolver.py	Wed Mar 12 23:02:40 2014 -0700
@@ -1,87 +1,90 @@
 from tests import WikkedTest, format_link, format_include
-from wikked.page import Page
 
 
 class ResolverTest(WikkedTest):
     def testPageInclude(self):
-        self.wiki = self._getWikiFromStructure({
-            'Foo.txt': "A test page.\n{{include: trans-desc}}\n",
-            'Trans Desc.txt': "BLAH\n"
+        wiki = self._getWikiFromStructure({
+            '/foo.txt': "A test page.\n{{include: trans-desc}}\n",
+            '/trans-desc.txt': "BLAH\n"
             })
-        foo = Page(self.wiki, 'foo')
-        self.assertEqual({'include': ['trans-desc']}, foo._getLocalMeta())
+        foo = wiki.getPage('/foo')
+        self.assertEqual({'include': ['trans-desc']}, foo.getLocalMeta())
         self.assertEqual(
                 "A test page.\n%s" % format_include('trans-desc'),
-                foo._getFormattedText())
+                foo.getFormattedText())
         self.assertEqual("A test page.\nBLAH", foo.text)
 
     def testPageIncludeWithMeta(self):
-        self.wiki = self._getWikiFromStructure({
-            'Foo.txt': "A test page.\n{{include: trans-desc}}\n",
-            'Trans Desc.txt': "BLAH: [[Somewhere]]\n{{bar: 42}}\n{{__secret: love}}\n{{+given: hope}}"
+        wiki = self._getWikiFromStructure({
+            'foo.txt': "A test page.\n{{include: trans-desc}}\n",
+            'trans-desc.txt': "BLAH: [[Somewhere]]\n{{bar: 42}}\n{{__secret: love}}\n{{+given: hope}}"
             })
-        foo = Page(self.wiki, 'foo')
-        self.assertEqual([], foo._getLocalLinks())
-        self.assertEqual({'include': ['trans-desc']}, foo._getLocalMeta())
+        foo = wiki.getPage('/foo')
+        self.assertEqual([], foo.getLocalLinks())
+        self.assertEqual({'include': ['trans-desc']}, foo.getLocalMeta())
         self.assertEqual(
                 "A test page.\n%s" % format_include('trans-desc'),
-                foo._getFormattedText())
+                foo.getFormattedText())
         self.assertEqual(
-                "A test page.\nBLAH: %s\n\n" % format_link('Somewhere', 'somewhere', True),
+                "A test page.\nBLAH: %s\n\n" % format_link('Somewhere', '/Somewhere', True),
                 foo.text)
-        self.assertEqual(['somewhere'], foo.links)
-        self.assertEqual({'bar': ['42'], 'given': ['hope'], 'include': ['trans-desc']}, foo.meta)
+        self.assertEqual(['/Somewhere'], foo.links)
+        self.assertEqual({'bar': ['42'], 'given': ['hope'], 'include': ['trans-desc']}, foo.getMeta())
 
     def testPageIncludeWithNamedTemplating(self):
-        self.wiki = self._getWikiFromStructure({
-            'Foo.txt': "A test page.\n{{include: greeting|name=Dave|what=drink}}\n",
-            'Greeting.txt': "Hello {{name}}, would you like a {{what}}?"
+        wiki = self._getWikiFromStructure({
+            'foo.txt': "A test page.\n{{include: greeting|name=Dave|what=drink}}\n",
+            'greeting.txt': "Hello {{name}}, would you like a {{what}}?"
             })
-        foo = Page(self.wiki, 'foo')
+        foo = wiki.getPage('/foo')
         self.assertEqual(
-            "A test page.\n%s" % format_include('greeting', 'name=Dave|what=drink'),
-            foo._getFormattedText())
+            "A test page.\n%s" % format_include(
+                'greeting',
+                '<div class="wiki-param" data-name="name">Dave</div><div class="wiki-param" data-name="what">drink</div>'),
+            foo.getFormattedText())
         self.assertEqual("A test page.\nHello Dave, would you like a drink?", foo.text)
 
     def testPageIncludeWithNumberedTemplating(self):
-        self.wiki = self._getWikiFromStructure({
-            'Foo.txt': "A test page.\n{{include: greeting|Dave|Roger|Tom}}\n",
-            'Greeting.txt': "Hello {{__args[0]}}, {{__args[1]}} and {{__args[2]}}."
+        wiki = self._getWikiFromStructure({
+            'foo.txt': "A test page.\n{{include: greeting|Dave|Roger|Tom}}\n",
+            'greeting.txt': "Hello {{__args[0]}}, {{__args[1]}} and {{__args[2]}}."
             })
-        foo = Page(self.wiki, 'foo')
+        foo = wiki.getPage('/foo')
         self.assertEqual(
-            "A test page.\n%s" % format_include('greeting', 'Dave|Roger|Tom'),
-            foo._getFormattedText())
+            "A test page.\n%s" % format_include(
+                'greeting',
+                '<div class="wiki-param" data-name="">Dave</div><div class="wiki-param" data-name="">Roger</div><div class="wiki-param" data-name="">Tom</div>'),
+            foo.getFormattedText())
         self.assertEqual("A test page.\nHello Dave, Roger and Tom.", foo.text)
 
     def testIncludeWithPageReferenceTemplating(self):
-        self.wiki =self._getWikiFromStructure({
-            'SelfRef.txt': "Here is {{read_url(__page.url, __page.title)}}!",
-            'Foo.txt': "Hello here.\n{{include: selfref}}\n"
+        wiki =self._getWikiFromStructure({
+            'selfref.txt': "Here is {{read_url(__page.url, __page.title)}}!",
+            'foo.txt': "Hello here.\n{{include: selfref}}\n"
             })
-        foo = Page(self.wiki, 'foo')
+        foo = wiki.getPage('/foo')
         self.assertEqual(
-            'Hello here.\nHere is <a class="wiki-link" data-wiki-url="foo">Foo</a>!',
+            'Hello here.\nHere is <a class="wiki-link" data-wiki-url="/foo">foo</a>!',
             foo.text
             )
 
     def testGivenOnlyInclude(self):
-        self.wiki = self._getWikiFromStructure({
+        wiki = self._getWikiFromStructure({
             'Base.txt': "The base page.\n{{include: Template 1}}",
             'Template 1.txt': "TEMPLATE!\n{{+include: Template 2}}",
             'Template 2.txt': "MORE TEMPLATE!"
             })
-        tpl1 = Page(self.wiki, 'template-1')
+        tpl1 = wiki.getPage('/Template 1')
         self.assertEqual(
-                "TEMPLATE!\n%s" % format_include('template-2', mod='+'),
-                tpl1._getFormattedText())
+                "TEMPLATE!\n%s" % format_include('Template 2', mod='+'),
+                tpl1.getFormattedText())
         self.assertEqual("TEMPLATE!\n", tpl1.text)
-        base = Page(self.wiki, 'base')
+        base = wiki.getPage('/Base')
         self.assertEqual("The base page.\nTEMPLATE!\nMORE TEMPLATE!", base.text)
 
     def testDoublePageIncludeWithMeta(self):
         return
-        self.wiki = self._getWikiFromStructure({
+        wiki = self._getWikiFromStructure({
             'Base.txt': "The base page.\n{{include: Template 1}}",
             'Wrong.txt': "{{include: Template 2}}",
             'Template 1.txt': "{{foo: bar}}\n{{+category: blah}}\n{{+include: Template 2}}\n{{__secret1: ssh}}",
@@ -89,27 +92,27 @@
             'Query 1.txt': "{{query: category=yolo}}",
             'Query 2.txt': "{{query: category=blah}}"
             })
-        base = Page(self.wiki, 'base')
+        base = wiki.getPage('/Base')
         self.assertEqual({
             'foo': ['bar'],
             'category': ['blah', 'yolo']
-            }, base.meta)
-        tpl1 = Page(self.wiki, 'template-1')
+            }, base.getMeta())
+        tpl1 = wiki.getPage('/Template 1')
         self.assertEqual({
             'foo': ['bar'],
             '+category': ['blah'],
-            '+include': ['template-2'],
+            '+include': ['Template 1'],
             '__secret': ['ssh']
-            }, tpl1.meta)
+            }, tpl1.getMeta())
         self.assertEqual(
-                "\n\n%s\n\n" % format_include('template-2'),
+                "\n\n%s\n\n" % format_include('/Template 2'),
                 tpl1.text)
-        q1 = Page(self.wiki, 'query-1')
+        q1 = wiki.getPage('query-1')
         self.assertEqual(
-                "<ul>\n<li>%s</li>\n<li>%s</li>\n</ul>" % (format_link('Base', 'base'), format_link('Wrong', 'wrong')),
+                "<ul>\n<li>%s</li>\n<li>%s</li>\n</ul>" % (format_link('Base', '/Base'), format_link('Wrong', '/Wrong')),
                 q1.text)
-        q2 = Page(self.wiki, 'query-2')
+        q2 = wiki.getPage('query-2')
         self.assertEqual(
-                "<ul>\n<li>%s</li>\n</ul>" % format_link('Base', 'base'),
+                "<ul>\n<li>%s</li>\n</ul>" % format_link('Base', '/Base'),
                 q2.text)