Revision: 6750 Author: cosoleto Date: 2009-04-29 15:58:10 +0000 (Wed, 29 Apr 2009)
Log Message: ----------- Created a 'data' directory for files used from test cases. Moved article-peer.xml and modified test-xmlreader.py accordingly.
Modified Paths: -------------- trunk/pywikipedia/tests/test-xmlreader.py
Added Paths: ----------- trunk/pywikipedia/tests/data/ trunk/pywikipedia/tests/data/article-pear.xml
Removed Paths: ------------- trunk/pywikipedia/tests/article-pear.xml
Deleted: trunk/pywikipedia/tests/article-pear.xml =================================================================== --- trunk/pywikipedia/tests/article-pear.xml 2009-04-29 13:05:37 UTC (rev 6749) +++ trunk/pywikipedia/tests/article-pear.xml 2009-04-29 15:58:10 UTC (rev 6750) @@ -1,109 +0,0 @@ -<mediawiki xmlns="http://www.mediawiki.org/xml/export-0.3/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.mediawiki.org/xml/export-0.3/ http://www.mediawiki.org/xml/export-0.3.xsd" version="0.3" xml:lang="en"> - <siteinfo> - <sitename>Wikipedia</sitename> - <base>http://en.wikipedia.org/wiki/Main_Page</base> - <generator>MediaWiki 1.15alpha</generator> - <case>first-letter</case> - <namespaces> - <namespace key="-2">Media</namespace> - <namespace key="-1">Special</namespace> - <namespace key="0" /> - <namespace key="1">Talk</namespace> - <namespace key="2">User</namespace> - <namespace key="3">User talk</namespace> - <namespace key="4">Wikipedia</namespace> - <namespace key="5">Wikipedia talk</namespace> - <namespace key="6">File</namespace> - <namespace key="7">File talk</namespace> - <namespace key="8">MediaWiki</namespace> - <namespace key="9">MediaWiki talk</namespace> - <namespace key="10">Template</namespace> - <namespace key="11">Template talk</namespace> - <namespace key="12">Help</namespace> - <namespace key="13">Help talk</namespace> - <namespace key="14">Category</namespace> - <namespace key="15">Category talk</namespace> - <namespace key="100">Portal</namespace> - <namespace key="101">Portal talk</namespace> - </namespaces> - </siteinfo> - <page> - <title>Pear</title> - <id>24278</id> - <revision> - <id>185185</id> - <timestamp>2002-02-25T15:43:11Z</timestamp> - <contributor> - <ip>Conversion script</ip> - </contributor> - <minor/> - <comment>Automated conversion</comment> - <text xml:space="preserve">Pears are [[tree]]s of the [[genus]] <em>Pyrus</em> and the edible [[fruit]] of that tree. -The pear is an important fruit in temperate regions. Like the [[apple]], the pear fruit is a [[pome]]. There are thousands of domesticated pear varieties. - -There are many species of pears. The most important for fruit production are <em>Pyrus communis</em> (European pear or simply pear) and <em>Pyrus pyrifolia</em> (Asian pear or apple pear). Other species are used as rootstocks for European and Asian pears and as ornamental trees. - -Unlike most fruits, European pears do not ripen on the tree. They must be picked and, sometimes, subjected to cold, before they will become sweet and soft. They store well in their mature but unripe state if kept cold. Asian pears are sweet on the tree and are eaten crisp. - -Pears are consumed fresh, canned, and as juice. Fermented pear juice is called [[perry]]. -</text> - </revision> - <revision> - <id>185241</id> - <timestamp>2002-08-31T02:16:06Z</timestamp> - <contributor> - <username>Quercusrobur</username> - <id>3741</id> - </contributor> - <text xml:space="preserve">Pears are [[tree]]s of the [[genus]] <em>Pyrus</em> and the edible [[fruit]] of that tree. -The pear is an important fruit in temperate regions. Like the [[apple]], the pear fruit is a [[pome]]. There are thousands of domesticated pear varieties. - -There are many species of pears. The most important for fruit production are <em>Pyrus communis</em> (European pear or simply pear) and <em>Pyrus pyrifolia</em> (Asian pear or apple pear). Other species are used as rootstocks for European and Asian pears and as ornamental trees. - -Unlike most fruits, European pears do not ripen on the tree. They must be picked and, sometimes, subjected to cold, before they will become sweet and soft. They store well in their mature but unripe state if kept cold. Asian pears are sweet on the tree and are eaten crisp. - -Pears are consumed fresh, canned, and as juice. Fermented pear juice is called [[perry]]. - -[[propagating apples and other fruit trees]]</text> - </revision> - <revision> - <id>185408</id> - <timestamp>2002-08-31T03:27:15Z</timestamp> - <contributor> - <username>Mav</username> - <id>62</id> - </contributor> - <minor/> - <text xml:space="preserve">Pears are [[tree]]s of the [[genus]] <em>Pyrus</em> and the edible [[fruit]] of that tree. -The pear is an important fruit in temperate regions. Like the [[apple]], the pear fruit is a [[pome]]. There are thousands of domesticated pear varieties. - -There are many species of pears. The most important for fruit production are <em>Pyrus communis</em> (European pear or simply pear) and <em>Pyrus pyrifolia</em> (Asian pear or apple pear). Other species are used as rootstocks for European and Asian pears and as ornamental trees. - -Unlike most fruits, European pears do not ripen on the tree. They must be picked and, sometimes, subjected to cold, before they will become sweet and soft. They store well in their mature but unripe state if kept cold. Asian pears are sweet on the tree and are eaten crisp. - -Pears are consumed fresh, canned, and as juice. Fermented pear juice is called [[perry]]. - -[[Fruit tree propogation]]</text> - </revision> - <revision> - <id>188924</id> - <timestamp>2002-08-31T05:53:10Z</timestamp> - <contributor> - <username>PierreAbbat</username> - <id>1123</id> - </contributor> - <minor/> - <comment>sp</comment> - <text xml:space="preserve">Pears are [[tree]]s of the [[genus]] <em>Pyrus</em> and the edible [[fruit]] of that tree. -The pear is an important fruit in temperate regions. Like the [[apple]], the pear fruit is a [[pome]]. There are thousands of domesticated pear varieties. - -There are many species of pears. The most important for fruit production are <em>Pyrus communis</em> (European pear or simply pear) and <em>Pyrus pyrifolia</em> (Asian pear or apple pear). Other species are used as rootstocks for European and Asian pears and as ornamental trees. - -Unlike most fruits, European pears do not ripen on the tree. They must be picked and, sometimes, subjected to cold, before they will become sweet and soft. They store well in their mature but unripe state if kept cold. Asian pears are sweet on the tree and are eaten crisp. - -Pears are consumed fresh, canned, and as juice. Fermented pear juice is called [[perry]]. - -[[Fruit tree propagation]]</text> - </revision> - </page> -</mediawiki>
Copied: trunk/pywikipedia/tests/data/article-pear.xml (from rev 6747, trunk/pywikipedia/tests/article-pear.xml) =================================================================== --- trunk/pywikipedia/tests/data/article-pear.xml (rev 0) +++ trunk/pywikipedia/tests/data/article-pear.xml 2009-04-29 15:58:10 UTC (rev 6750) @@ -0,0 +1,109 @@ +<mediawiki xmlns="http://www.mediawiki.org/xml/export-0.3/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.mediawiki.org/xml/export-0.3/ http://www.mediawiki.org/xml/export-0.3.xsd" version="0.3" xml:lang="en"> + <siteinfo> + <sitename>Wikipedia</sitename> + <base>http://en.wikipedia.org/wiki/Main_Page</base> + <generator>MediaWiki 1.15alpha</generator> + <case>first-letter</case> + <namespaces> + <namespace key="-2">Media</namespace> + <namespace key="-1">Special</namespace> + <namespace key="0" /> + <namespace key="1">Talk</namespace> + <namespace key="2">User</namespace> + <namespace key="3">User talk</namespace> + <namespace key="4">Wikipedia</namespace> + <namespace key="5">Wikipedia talk</namespace> + <namespace key="6">File</namespace> + <namespace key="7">File talk</namespace> + <namespace key="8">MediaWiki</namespace> + <namespace key="9">MediaWiki talk</namespace> + <namespace key="10">Template</namespace> + <namespace key="11">Template talk</namespace> + <namespace key="12">Help</namespace> + <namespace key="13">Help talk</namespace> + <namespace key="14">Category</namespace> + <namespace key="15">Category talk</namespace> + <namespace key="100">Portal</namespace> + <namespace key="101">Portal talk</namespace> + </namespaces> + </siteinfo> + <page> + <title>Pear</title> + <id>24278</id> + <revision> + <id>185185</id> + <timestamp>2002-02-25T15:43:11Z</timestamp> + <contributor> + <ip>Conversion script</ip> + </contributor> + <minor/> + <comment>Automated conversion</comment> + <text xml:space="preserve">Pears are [[tree]]s of the [[genus]] <em>Pyrus</em> and the edible [[fruit]] of that tree. +The pear is an important fruit in temperate regions. Like the [[apple]], the pear fruit is a [[pome]]. There are thousands of domesticated pear varieties. + +There are many species of pears. The most important for fruit production are <em>Pyrus communis</em> (European pear or simply pear) and <em>Pyrus pyrifolia</em> (Asian pear or apple pear). Other species are used as rootstocks for European and Asian pears and as ornamental trees. + +Unlike most fruits, European pears do not ripen on the tree. They must be picked and, sometimes, subjected to cold, before they will become sweet and soft. They store well in their mature but unripe state if kept cold. Asian pears are sweet on the tree and are eaten crisp. + +Pears are consumed fresh, canned, and as juice. Fermented pear juice is called [[perry]]. +</text> + </revision> + <revision> + <id>185241</id> + <timestamp>2002-08-31T02:16:06Z</timestamp> + <contributor> + <username>Quercusrobur</username> + <id>3741</id> + </contributor> + <text xml:space="preserve">Pears are [[tree]]s of the [[genus]] <em>Pyrus</em> and the edible [[fruit]] of that tree. +The pear is an important fruit in temperate regions. Like the [[apple]], the pear fruit is a [[pome]]. There are thousands of domesticated pear varieties. + +There are many species of pears. The most important for fruit production are <em>Pyrus communis</em> (European pear or simply pear) and <em>Pyrus pyrifolia</em> (Asian pear or apple pear). Other species are used as rootstocks for European and Asian pears and as ornamental trees. + +Unlike most fruits, European pears do not ripen on the tree. They must be picked and, sometimes, subjected to cold, before they will become sweet and soft. They store well in their mature but unripe state if kept cold. Asian pears are sweet on the tree and are eaten crisp. + +Pears are consumed fresh, canned, and as juice. Fermented pear juice is called [[perry]]. + +[[propagating apples and other fruit trees]]</text> + </revision> + <revision> + <id>185408</id> + <timestamp>2002-08-31T03:27:15Z</timestamp> + <contributor> + <username>Mav</username> + <id>62</id> + </contributor> + <minor/> + <text xml:space="preserve">Pears are [[tree]]s of the [[genus]] <em>Pyrus</em> and the edible [[fruit]] of that tree. +The pear is an important fruit in temperate regions. Like the [[apple]], the pear fruit is a [[pome]]. There are thousands of domesticated pear varieties. + +There are many species of pears. The most important for fruit production are <em>Pyrus communis</em> (European pear or simply pear) and <em>Pyrus pyrifolia</em> (Asian pear or apple pear). Other species are used as rootstocks for European and Asian pears and as ornamental trees. + +Unlike most fruits, European pears do not ripen on the tree. They must be picked and, sometimes, subjected to cold, before they will become sweet and soft. They store well in their mature but unripe state if kept cold. Asian pears are sweet on the tree and are eaten crisp. + +Pears are consumed fresh, canned, and as juice. Fermented pear juice is called [[perry]]. + +[[Fruit tree propogation]]</text> + </revision> + <revision> + <id>188924</id> + <timestamp>2002-08-31T05:53:10Z</timestamp> + <contributor> + <username>PierreAbbat</username> + <id>1123</id> + </contributor> + <minor/> + <comment>sp</comment> + <text xml:space="preserve">Pears are [[tree]]s of the [[genus]] <em>Pyrus</em> and the edible [[fruit]] of that tree. +The pear is an important fruit in temperate regions. Like the [[apple]], the pear fruit is a [[pome]]. There are thousands of domesticated pear varieties. + +There are many species of pears. The most important for fruit production are <em>Pyrus communis</em> (European pear or simply pear) and <em>Pyrus pyrifolia</em> (Asian pear or apple pear). Other species are used as rootstocks for European and Asian pears and as ornamental trees. + +Unlike most fruits, European pears do not ripen on the tree. They must be picked and, sometimes, subjected to cold, before they will become sweet and soft. They store well in their mature but unripe state if kept cold. Asian pears are sweet on the tree and are eaten crisp. + +Pears are consumed fresh, canned, and as juice. Fermented pear juice is called [[perry]]. + +[[Fruit tree propagation]]</text> + </revision> + </page> +</mediawiki>
Modified: trunk/pywikipedia/tests/test-xmlreader.py =================================================================== --- trunk/pywikipedia/tests/test-xmlreader.py 2009-04-29 13:05:37 UTC (rev 6749) +++ trunk/pywikipedia/tests/test-xmlreader.py 2009-04-29 15:58:10 UTC (rev 6750) @@ -9,12 +9,12 @@
class XmlReaderTestCase(unittest.TestCase): def test_XmlDumpAllRevs(self): - pages = [r for r in xmlreader.XmlDump("article-pear.xml", allrevisions=True).parse()] + pages = [r for r in xmlreader.XmlDump("data/article-pear.xml", allrevisions=True).parse()] self.assertEquals(4, len(pages)) self.assertNotEquals("", pages[0].comment)
def test_XmlDumpFirstRev(self): - pages = [r for r in xmlreader.XmlDump("article-pear.xml").parse()] + pages = [r for r in xmlreader.XmlDump("data/article-pear.xml").parse()] self.assertEquals(1, len(pages)) self.assertNotEquals("", pages[0].comment)
@@ -24,7 +24,7 @@ def pageDone(page): pages.append(page) handler.setCallback(pageDone) - xml.sax.parse("article-pear.xml", handler) + xml.sax.parse("data/article-pear.xml", handler) self.assertEquals(4, len(pages)) self.assertNotEquals("", pages[0].comment)