comparison tests/test_page.py @ 64:0b4f4c23770a

Removed specific "include"-related properties from the code and DB. (they can already be accessed via the meta) Fixed a bug with handling includes in queries. Better code in some places in the formatter.
author Ludovic Chabant <ludovic@chabant.com>
date Thu, 07 Feb 2013 22:34:13 -0800
parents 494f3c4660ed
children 9afe4a1dbd1e
comparison
equal deleted inserted replaced
63:97efd73f2158 64:0b4f4c23770a
19 self.assertEqual('A test page.', page.formatted_text) 19 self.assertEqual('A test page.', page.formatted_text)
20 self.assertEqual('foo', page.title) 20 self.assertEqual('foo', page.title)
21 self.assertEqual('A test page.', page.text) 21 self.assertEqual('A test page.', page.text)
22 self.assertEqual({}, page.local_meta) 22 self.assertEqual({}, page.local_meta)
23 self.assertEqual([], page.local_links) 23 self.assertEqual([], page.local_links)
24 self.assertEqual([], page.local_includes)
25 24
26 def testPageMeta(self): 25 def testPageMeta(self):
27 self.wiki = self._getWikiFromStructure({ 26 self.wiki = self._getWikiFromStructure({
28 'foo.txt': "A page with simple meta.\n{{bar: baz}}\n{{is_test: }}" 27 'foo.txt': "A page with simple meta.\n{{bar: baz}}\n{{is_test: }}"
29 }) 28 })
33 self.assertEqual('A page with simple meta.\n\n', page.formatted_text) 32 self.assertEqual('A page with simple meta.\n\n', page.formatted_text)
34 self.assertEqual('foo', page.title) 33 self.assertEqual('foo', page.title)
35 self.assertEqual('A page with simple meta.\n\n', page.text) 34 self.assertEqual('A page with simple meta.\n\n', page.text)
36 self.assertEqual({'bar': 'baz', 'is_test': True}, page.local_meta) 35 self.assertEqual({'bar': 'baz', 'is_test': True}, page.local_meta)
37 self.assertEqual([], page.local_links) 36 self.assertEqual([], page.local_links)
38 self.assertEqual([], page.local_includes)
39 37
40 def testPageTitleMeta(self): 38 def testPageTitleMeta(self):
41 self.wiki = self._getWikiFromStructure({ 39 self.wiki = self._getWikiFromStructure({
42 'test_title.txt': "A page with a custom title.\n{{title: TEST-TITLE}}" 40 'test_title.txt': "A page with a custom title.\n{{title: TEST-TITLE}}"
43 }) 41 })
47 self.assertEqual('A page with a custom title.\n', page.formatted_text) 45 self.assertEqual('A page with a custom title.\n', page.formatted_text)
48 self.assertEqual('TEST-TITLE', page.title) 46 self.assertEqual('TEST-TITLE', page.title)
49 self.assertEqual('A page with a custom title.\n', page.text) 47 self.assertEqual('A page with a custom title.\n', page.text)
50 self.assertEqual({'title': 'TEST-TITLE'}, page.local_meta) 48 self.assertEqual({'title': 'TEST-TITLE'}, page.local_meta)
51 self.assertEqual([], page.local_links) 49 self.assertEqual([], page.local_links)
52 self.assertEqual([], page.local_includes)
53 50
54 def testPageOutLinks(self): 51 def testPageOutLinks(self):
55 self.wiki = self._getWikiFromStructure({ 52 self.wiki = self._getWikiFromStructure({
56 'test_links.txt': "Follow a link to the [[Sandbox]]. Or to [[this page|Other Sandbox]].", 53 'test_links.txt': "Follow a link to the [[Sandbox]]. Or to [[this page|Other Sandbox]].",
57 'sandbox.txt': "This is just a placeholder." 54 'sandbox.txt': "This is just a placeholder."
96 self.wiki = self._getWikiFromStructure({ 93 self.wiki = self._getWikiFromStructure({
97 'Foo.txt': "A test page.\n{{include: trans-desc}}\n", 94 'Foo.txt': "A test page.\n{{include: trans-desc}}\n",
98 'Trans Desc.txt': "BLAH\n" 95 'Trans Desc.txt': "BLAH\n"
99 }) 96 })
100 foo = Page(self.wiki, 'foo') 97 foo = Page(self.wiki, 'foo')
101 self.assertEqual(['trans-desc'], foo.local_includes) 98 self.assertEqual({'include': 'trans-desc'}, foo.local_meta)
102 self.assertEqual( 99 self.assertEqual(
103 "A test page.\n%s" % format_include('trans-desc'), 100 "A test page.\n%s" % format_include('trans-desc'),
104 foo.formatted_text) 101 foo.formatted_text)
105 self.assertEqual("A test page.\nBLAH\n\n", foo.text) 102 self.assertEqual("A test page.\nBLAH\n\n", foo.text)
106 103
108 self.wiki = self._getWikiFromStructure({ 105 self.wiki = self._getWikiFromStructure({
109 'Foo.txt': "A test page.\n{{include: trans-desc}}\n", 106 'Foo.txt': "A test page.\n{{include: trans-desc}}\n",
110 'Trans Desc.txt': "BLAH: [[Somewhere]]\n{{bar: 42}}\n{{__secret: love}}\n{{+given: hope}}" 107 'Trans Desc.txt': "BLAH: [[Somewhere]]\n{{bar: 42}}\n{{__secret: love}}\n{{+given: hope}}"
111 }) 108 })
112 foo = Page(self.wiki, 'foo') 109 foo = Page(self.wiki, 'foo')
113 self.assertEqual(['trans-desc'], foo.local_includes)
114 self.assertEqual([], foo.local_links) 110 self.assertEqual([], foo.local_links)
115 self.assertEqual({'include': 'trans-desc'}, foo.local_meta) 111 self.assertEqual({'include': 'trans-desc'}, foo.local_meta)
116 self.assertEqual( 112 self.assertEqual(
117 "A test page.\n%s" % format_include('trans-desc'), 113 "A test page.\n%s" % format_include('trans-desc'),
118 foo.formatted_text) 114 foo.formatted_text)
119 self.assertEqual( 115 self.assertEqual(
120 "A test page.\nBLAH: %s\n\n\n\n" % format_link('Somewhere', 'somewhere', True), 116 "A test page.\nBLAH: %s\n\n\n\n" % format_link('Somewhere', 'somewhere', True),
121 foo.text) 117 foo.text)
122 self.assertEqual(['trans-desc'], foo.all_includes)
123 self.assertEqual(['somewhere'], foo.all_links) 118 self.assertEqual(['somewhere'], foo.all_links)
124 self.assertEqual({'bar': '42', 'given': 'hope', 'include': 'trans-desc'}, foo.all_meta) 119 self.assertEqual({'bar': '42', 'given': 'hope', 'include': 'trans-desc'}, foo.all_meta)
125 120
126 def testPageIncludeWithTemplating(self): 121 def testPageIncludeWithTemplating(self):
127 self.wiki = self._getWikiFromStructure({ 122 self.wiki = self._getWikiFromStructure({