Merge lp:~fenryxo/zim/custom-objects into lp:~jaap.karssenberg/zim/custom-objects

[Jiří Janoušek]

Pushing my changes:
* Resolved conflicts with trunk.
* SourceView plugin ported to the new style dependency check.
* Fixed KeyError when fallback object factory is used.
* Fixed bug when export of Code Block failed in non-GUI mode.
* If there is an inactive plugin for an unknown object a button
  is shown to activate plugin easily.

=== modified file '.bzrignore'
--- .bzrignore	2010-05-23 23:14:12 +0000
+++ .bzrignore	2011-06-04 21:27:03 +0000
@@ -15,6 +15,8 @@
 ./debian/pycompat
 ./man
 ./html
+./apidoc
 ./windows/build
 ./windows/version-and-date.nsi
 ./xdg/hicolor
+

=== modified file 'CHANGELOG.txt'
--- CHANGELOG.txt	2011-02-19 16:27:44 +0000
+++ CHANGELOG.txt	2011-06-04 21:27:03 +0000
@@ -5,6 +5,37 @@
 Earlier version numbers for zim correspond to the Perl branch.
 
 
+=== 0.51 - Thu 28 Apr 2011 ===
+Bug fix release
+* Fixed a critical bug in the "Add Notebook" prompt for the first notebook on
+  a fresh install and two minor bugs with the ntoebook list - Jiří Janoušek
+
+
+=== 0.51 - Tue 19 Apr 2011 ===
+* Fixed critical bug with resizing images - Stefan Muthers
+* Fixed bug preventing resizing of text entries in dialogs
+* Fixed bug disabling auto-completion for page names in dialogs
+* Fix so cancelling the preferences dialog will also reset plugins
+  - Lisa Vitolo
+* Fix to switch sensitivity of items in the Edit menu on cursor position
+  - Konstantin Baierer
+* Fix to handle case where document_root is inside notebook folder
+  - Jiří Janoušek
+* Fixed support for interwiki links in export
+* Fixed "Link Map" plugin to actually support clicking on page names in the map
+* Fixed copy pasting to use plain text by default for external applications
+  added preference to revert to old behavior
+* Disable <Alt><Space> keybinding due to conflicts with internationalization
+  added hidden preference to get it back if desired
+* Added support for organizing pages by tags - Fabian Moser
+* Added feature to zoom font size of the page view on <Ctrl>+ / <Ctrl>-
+  - Konstantin Baierer
+* Added support for system Trash (using gio if available)
+* Added Calendar widget to the "Insert Date" dialog
+* Added plugin to sort selected lines - NorfCran
+* Added plugin for GNUplot plots - Alessandro Magni
+
+
 === 0.50 - Mon 14 Feb 2011 ===
 Maintenance release with many bug fixes. Biggest change is the refactoring
 of input forms and dialogs, but this is not very visible to the user.
@@ -191,9 +222,11 @@
 * Added a web-based interface to read zim notebooks
 * Task List now supports tags
 * Distinguishing between "move page" and "rename page"
-* Menu actions like "Rename Page (F2)" now follow the focus and work in the side pane as well
+* Menu actions like "Rename Page (F2)" now follow the focus and work in the 
+  side pane as well
 * Page title can be updated automatically when moving a page
-* "Link" action behaves more like inserting an object instead of applying formatting
+* "Link" action behaves more like inserting an object instead of applying 
+  formatting
 * File links are now inserted showing only the basename of the file
 * Dialogs spawned from another dialog will pop over it
 * Dialogs remember their window size

=== modified file 'HACKING/Release_checklist.txt'
--- HACKING/Release_checklist.txt	2011-02-19 16:27:44 +0000
+++ HACKING/Release_checklist.txt	2011-06-04 21:27:03 +0000
@@ -13,34 +13,34 @@
 
 Merge translations:
 * Request download from launchpad
-* Merge it with tools/import-launchpad-translations.py
+* Merge it with ''tools/import-launchpad-translations.py''
 
 Prepare the package:
 * Set version in ''zim/__init__.py''
-* Update CHANGELOG.txt -- see `bzr visualize` for changes
-* Update debian changes -- run e.g. `debchange -v 0.46`
+* Update CHANGELOG.txt -- see `''bzr visualize''` for changes
+* Update debian changes -- run e.g. `''debchange -v 0.46''`
 * Optionally merge branch with website updates since previous release
 * Update version number in website downloads page
 
 Check the package:
-* `./setup.py sdist` (updates meta data etc.)
-* `make builddeb` and check `lintian -Ivi ../zim_0.46_i386.changes`
+* `''./setup.py sdist''` (updates meta data etc.)
+* `make builddeb` and check `''lintian -Ivi ../zim_0.46_i386.changes''`
 * Test website with ./tools/test_website.py
-* Run `make clean` and check `bzr st` for any remaining build files
+* Run `''make clean''` and check `''bzr st''` for any remaining build files
 
 Finalize the revision:
-* run ./test.py for the last time
+* run ''./test.py'' for the last time
 
 * commit + tag + push
 
 Build release packages:
-* `./setup.py sdist` (updates meta data etc.)
-* `make builddeb` + `make clean`
-* ./tools/build_website.sh
+* `''./setup.py sdist''` (updates meta data etc.)
+* `''make builddeb''` + `''make clean''`
+* ''./tools/build_website.sh''
 
 Publish to launchpad PPA:
-* debuild -S -kB3223C82
-* dput ppa:jaap.karssenberg/zim zim_XX_sources.changes
+* ''debuild -S -kB3223C82''
+* ''dput ppa:jaap.karssenberg/zim ../zim_XX_sources.changes''
 
 Publish the release:
 * Upload website
@@ -48,5 +48,19 @@
 * Write release notes
 * Announce on freshmeat
 * Announce on launchpad
-* Announce on gnome files 
+* ~~Announce on gnome files~~
 * Announce on mailing list
+
+
+**For snapshots**
+* `''./setup.py sdist`'' to update build meta data
+* ''debchange -v 0.50-SNASPSHOT-r359''
+* ''debuild -S -kB3223C82''
+* ''lintian -Ivi ../zim_0.46_i386.changes''
+* ''dput ppa:jaap.karssenberg/zim-snapshots ../zim_XX_sources.changes''
+
+To check version numbering is OK use: 
+
+'''
+dpkg --compare-versions "0.51" gt "0.50-SNAPSHOT-r345" && echo OK
+'''

=== modified file 'HACKING/Start.txt'
--- HACKING/Start.txt	2010-01-31 11:22:31 +0000
+++ HACKING/Start.txt	2011-06-04 21:27:03 +0000
@@ -24,6 +24,12 @@
 
 ===== Classes =====
 
+**NOTE: the overview below is limitted and partially out of date. To generate a full set of API docs install "epydoc" [1] and run "make epydoc" in the zim source dir**
+
+[1] http://epydoc.sourceforge.net/
+
+-----
+
 Each class has inline documentation, use pydoc to view it.
 The tree below is only a summary, run "dev/class_tree.py" to see
 the full tree.

=== added file 'HACKING/Test_Suite.txt'
--- HACKING/Test_Suite.txt	1970-01-01 00:00:00 +0000
+++ HACKING/Test_Suite.txt	2011-06-04 21:27:03 +0000
@@ -0,0 +1,19 @@
+Content-Type: text/x-zim-wiki
+Wiki-Format: zim 0.4
+Creation-Date: 2011-05-13T23:18:07+02:00
+
+====== Test Suite ======
+
+Zim comes with a full test suite, it can be executed using the "''test.py''" script. See "''test.py --help''" for it's commandline options.
+
+It is good practice to run the full suite before committing to a development branch and especially before generating a merge request. This should ensures the new patch doesn't break any existing code.
+
+For any but the most trivial fixes test cases should be written to ensure the functionality works as designed and to avoid breaking it again at a later time. You'll surprise how often the same bug comes back after some time if there is now test case is in place to detect it. Some bugs are just waiting to happen again and again.
+
+For writing tests have a look at the existing test code or check the documentation for the "unittest" module in the python library. (For python versions < 2.7 we use the "unittest2" module, which backports some new features for older python versions.)
+
+A most useful tool for developing tests is looking at test **coverage**. When you run "''test.py''" with the "''--coverage''" option the "coverage" module will be loaded and a set of html pages will be generated in "''./coverage''". In these pages you can see line by line what code is called during the test run and what lines of code go untested. It is hard to really get to 100% coverage, but the target should be to get the coverage above at least 80% for each module.
+
+If you added e.g. a new class and wrote a test case for it have a look at the coverage to see what additional tests are needed to cover all code. 
+
+Of course having full coverage is no guarantee we cover all possible inputs, but looking at coverage combined with writing tests for reported bugs makes a strong test suite. Even if the test suite only catches the most simple bugs that users would see when first using the application it is worth the effort.

=== modified file 'MANIFEST.in'
--- MANIFEST.in	2010-07-22 21:33:10 +0000
+++ MANIFEST.in	2011-06-04 21:27:03 +0000
@@ -10,7 +10,7 @@
 recursive-include tools/ *
 recursive-include xdg/ *
 prune xdg/hicolor/
-recursive-include po/ *
+recursive-include translations/ *
 recursive-include cgi-bin/ *
 recursive-include contrib/ *
 recursive-include HACKING/ *

=== modified file 'Makefile'
--- Makefile	2010-06-24 20:27:50 +0000
+++ Makefile	2011-06-04 21:27:03 +0000
@@ -13,6 +13,7 @@
 	@echo "make source - Create source package"
 	@echo "make buildrpm - Generate a rpm package"
 	@echo "make builddeb - Generate a deb package"
+	@echo "make epydoc - Generate API docs using 'epydoc'"
 	@echo "make clean - Get rid of scratch and byte files"
 
 source:
@@ -31,6 +32,11 @@
 	dpkg-buildpackage -i -I -rfakeroot
 	$(MAKE) -f $(CURDIR)/debian/rules clean
 
+epydoc:
+	rm -fr ./apidoc
+	epydoc --html zim --graph umlclasstree -o ./apidoc --parse-only --no-private
+	@echo -e '\nAPI docs are available in ./apidoc'
+
 clean:
 	$(PYTHON) setup.py clean
 	rm -rf build/ MANIFEST tests/tmp/ locale/ man/ xdg/hicolor

=== modified file 'README.txt'
--- README.txt	2011-02-19 16:27:44 +0000
+++ README.txt	2011-06-04 21:27:03 +0000
@@ -20,7 +20,7 @@
 
 ====== COPYRIGHT ======
 
-Copyright 2008, 2009 Jaap Karssenberg <[e-mail]>
+Copyright 2008, 2011 Jaap Karssenberg <[e-mail]>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

=== modified file 'data/dates.list'
--- data/dates.list	2009-08-15 15:02:30 +0000
+++ data/dates.list	2011-06-04 21:27:03 +0000
@@ -1,9 +1,10 @@
 # List with date-time formats used for the
 # "Insert Date eand Time" dialog.
 # See man strftime a description of the format.
+%x
 %c
 %A %d/%m/%Y
 %A %d/%m/%Y %H:%M
 %A %d %B %Y
-%x
-%F
+[d: %Y-%m-%d]
+%Y-%m-%d

=== modified file 'data/manual/Help.txt'
--- data/manual/Help.txt	2010-07-08 20:29:24 +0000
+++ data/manual/Help.txt	2011-06-04 21:27:03 +0000
@@ -13,6 +13,7 @@
 * [[+Notebooks|Notebooks]]
 * [[+Pages|Pages]]
 * [[+Links|Links]]
+* [[+Tags|Tags]]
 
 Editing
 * [[+Key Bindings|Key Bindings]]

=== modified file 'data/manual/Help/Config_Files.txt'
--- data/manual/Help/Config_Files.txt	2011-02-14 20:22:50 +0000
+++ data/manual/Help/Config_Files.txt	2011-06-04 21:27:03 +0000
@@ -30,6 +30,8 @@
 
 The config file is written automatically when you close zim. So if you want to change it manually you need to close all instances of zim first.
 
+There is a hidden option here called "''autosave_timeout''" which gives the interval for autosaving in seconds, default is 10.
+
 ==== Interwiki URL list ====
 The file ''XDG_DATA/zim/urls.list'' gives a list of urls which are used for the [[Links|interwiki]] function. All files in the XDG_DATA path are read when looking for an url, so you can use XDG_DATA_HOME to overload the installation defaults.
 
@@ -118,3 +120,5 @@
 There is a notebook specific config files called "''notebook.zim''" which should be in the notebook folder. This file contains a section "''[Notebook]''" which contains the properties that can be set in the [[properties|properties dialog]].
 
 There is one hidden property, called "''end_of_line''" which determines the end-of-line convention for files written by zim within the scope of this notebook. The value can be either "''dos''" or "''unix''". For newly created notebooks this value is set depending on the platform on which zim is running. Main purpose of this property is to ensure that a notebook which is shared between e.g. linux and windows machines does not change the full file on every write. When desired the property can be changed manually, which will affect all pages edited after the change.
+
+A second hidden option is "''disable_trash''" which defaults to ''False''. If enabled this will cause zim to avoid using the system trash for this notebook, see the section about deleting in [[Pages]].

=== modified file 'data/manual/Help/Key_Bindings.txt'
--- data/manual/Help/Key_Bindings.txt	2010-01-19 18:41:47 +0000
+++ data/manual/Help/Key_Bindings.txt	2011-06-04 21:27:03 +0000
@@ -10,103 +10,104 @@
 
 '''
 F9		Toggle index visibility
-alt-space	Toggle focus between index and buffer
+<Ctrl><Space>	Toggle focus between index and buffer
     		opens side pane if index is invisible
-ctrl-space	Same as ctrl-space - optional see preferences
-ctrl-tab	Focus next inteface element (gtk default)
-'''
-
-
-'''
-alt-home	Go to the home page
-alt-left	Go one page back in history
-alt-right	Go one page forward in history
-alt-up		Go one page up in the namespace
-alt-down	Go one page down in the namespace
+		(optional see preferences)
+<Ctrl><Tab>	Focus next inteface element (gtk default)
+'''
+
+
+'''
+<Alt><Home>	Go to the home page
+<Alt><Left>	Go one page back in history
+<Alt><Right>	Go one page forward in history
+<Alt><Up>	Go one page up in the namespace
+<Alt><Down>	Go one page down in the namespace
 		(The actual page is choosen by the history)
-alt-pgup	Go to the previous page in the index
-alt-pgdown	Go to the next page in the index
-alt-D		Go to todays page
-'''
-
-
-'''
-^Q		Quit the application
-^w		Close window
-'''
-
-
-'''
-^F		Find in the current page
-^G		Find next
-shift-^G	Find previous
-shift-^F  	Search in all pages
-^H		Find and Replace
-'''
-
-
-'''
-^S		Save page        (forced)
-shift-^S	Save version...
-^R		Reload page      (saves first)
-^J		Jump to page...  (either an existing or a new page)
-'''
-
-
-'''
-^L		Link selected text
+<Alt><PgUp>	Go to the previous page in the index
+<Alt><PgDown>	Go to the next page in the index
+<Alt>D		Go to todays page
+'''
+
+
+'''
+<Ctrl>Q		Quit the application
+<Ctrl>w		Close window
+'''
+
+
+'''
+<Ctrl>F		Find in the current page
+<Ctrl>G		Find next
+<Shift><Ctrl>G	Find previous
+<Shift><Ctrl>F  Search in all pages
+<Ctrl>H		Find and Replace
+'''
+
+
+'''
+<Ctrl>S		Save page        (forced)
+<Shift><Ctrl>S	Save version...
+<Ctrl>R		Reload page      (saves first)
+<Ctrl>J		Jump to page...  (either an existing or a new page)
+'''
+
+
+'''
+<Ctrl>L		Link selected text
 		Follow selected text as link when read-only
-shift-^L	Copy a link to the current page to the clipboard
+<Shift><Ctrl>L	Copy a link to the current page to the clipboard
 		In the side pane copies a link to the selected page
-		(Paste this link in a page with ^V)
-^E		Show the "edit link" dialog
-^D		Inserts timestamp
-'''
-
-
-'''
-^1..^5		Make selected text a heading
-^6		Make selected text normal
-^B		Make selected text strong
-^I		Make selected text italic
-^U		Make selected text underline     (renders highlighted)
-^K		Make selected text strike-trough
-^T		Make selected text verbatim text (monospace font)
-'''
-
-
-'''
-^Z		Undo
-Shift-^Z	Redo
-^Y		Redo
-'''
-
-
-'''
-shift-^D	Show the calendar dialog
+		(Paste this link in a page with <Ctrl>V)
+<Ctrl>E		Show the "edit link" dialog
+<Ctrl>D		Inserts timestamp
+'''
+
+
+'''
+<Ctrl>1..<Ctrl>5		Make selected text a heading
+<Ctrl>9		Make selected text normal
+<Ctrl>B		Make selected text strong
+<Ctrl>I		Make selected text italic
+<Ctrl>U		Make selected text underline     (renders highlighted)
+<Ctrl>K		Make selected text strike-trough
+<Ctrl>T		Make selected text verbatim text (monospace font)
+'''
+
+
+'''
+<Ctrl>Z		Undo
+<Shift><Ctrl>Z	Redo
+<Ctrl>Y		Redo
+'''
+
+
+'''
+<Shift><Ctrl>D	Show the calendar dialog
 '''
 
 
 '''
 F1		Show the manual
 F2		Rename current page
-F3		Find next	(same as ^G)
-F5		Reload page	(same as ^R)
+F3		Find next	(same as <Ctrl>G)
+<Shift>F3	Find previous	(same as <Ctrl>G)
+F5		Reload page	(same as <Ctrl>R)
 F12		Toggle checkbox item to 'OK'
-Shift-F12	Toggle checkbox item to 'NOK'
+<Shift>F12	Toggle checkbox item to 'NOK'
 '''
 
 Also all the usual keybindings apply for the gtk text edit widget, thus bindings like
-''^C'', ''^X'', ''^V'', ''^A'' etc. work as expected.
+''<Ctrl>C'', ''<Ctrl>X'', ''<Ctrl>V'', ''<Ctrl>A'' etc. work as expected.
 
 ==== Side pane tree ====
 The following key bindings works when the tree in the side pane is focussed:
 
 '''
-^L		Insert a link to the selected page
-shift-^L	Copy the selected page to clipboard
-^C		Copy the selected page to clipboard
-^F		Search in the page list as shown
+<Ctrl>L		Insert a link to the selected page
+<Shift><Ctrl>L	Copy the selected page to clipboard
+<Ctrl>C		Copy the selected page to clipboard
+<Ctrl>F		Search in the page list as shown
 *		Expand all
 \		Collapse all
 '''
@@ -118,9 +119,9 @@
 '''
 *		Toggle bullets for selected text
 >		Toggle email-style quoting for selected text
-TAB		Indent selected text
-shift-TAB	Un-indents selected text
-BACKSPACE	Un-indents selected text
+<Tab>		Indent selected text
+<Shift><Tab>	Un-indents selected text
+<Backspace>	Un-indents selected text
 '''
 
 

=== modified file 'data/manual/Help/Pages.txt'
--- data/manual/Help/Pages.txt	2010-01-19 18:41:47 +0000
+++ data/manual/Help/Pages.txt	2011-06-04 21:27:03 +0000
@@ -32,3 +32,9 @@
 ===== Jump To Dialog =====
 This dialog is intended to jump to a specified page. It is actually hardly different from the New Page dialog except that it resolves page names relative to the current page and does not immediately create a new page. However you can always create new pages by jumping to a page that does not yet exist and start editing.
 
+===== Deleting pages =====
+When you select "Delete Page" by default zim will try to trash the page and all it's sub pages and attachments - **that means all files that are in the folder below the text file for the page**. If you deleted something on accident you should be able to recover the data from your system's trash can. After recovering data you probable need to run "Re-build Index" from the "Tools" menu to make sure zim indexes the data again.
+
+If zim is not able to move data to the trash can it will offer to delete the data permanently. In this case a dialog is shown to ask for confirmation which includes a detailed list of files to be deleted.
+
+If you don't like to use the trash by default (e.g. for notebooks that contain sensitive data) there is an option in the notebook [[Config Files|config file]] to disable the trash. In this case the confirmation dialog will always be shown on "delete page".

=== modified file 'data/manual/Help/Searching.txt'
--- data/manual/Help/Searching.txt	2010-07-20 20:37:06 +0000
+++ data/manual/Help/Searching.txt	2011-06-04 21:27:03 +0000
@@ -54,6 +54,7 @@
 Links:
 LinksFrom:
 LinksTo:
+Tag:
 
 
 === Details ===
@@ -125,6 +126,7 @@
 	**Links:**
 	**LinksFrom:**
 	**LinksTo:**
+	**Tag:**
 
  For example to only search the page names you can use:
 
@@ -160,3 +162,10 @@
 namespace: Date and linksto: Planning
 '''
 
+The keyword "Tag" can be used to search for specifc tags like:
+'''
+
+Tag: home
+'''
+
+Note that a simple search for a single word like "''@home''" will automatically be converted to "''Tag: home''"

=== added file 'data/manual/Help/Tags.txt'
--- data/manual/Help/Tags.txt	1970-01-01 00:00:00 +0000
+++ data/manual/Help/Tags.txt	2011-06-04 21:27:03 +0000
@@ -0,0 +1,13 @@
+Content-Type: text/x-zim-wiki
+Wiki-Format: zim 0.4
+Creation-Date: 2011-04-04T21:14:35+02:00
+
+====== Tags ======
+
+Zim supports the use of tags to organize pages. Tags are keywords or labels that are used to categorize pages.
+
+Tags can be used anywhere in a page using the "@" prefix. Like this: @example @tags
+
+To find context based on tags you can use the [[Searching|Search]] dialog. For example to find all pages tagged with "@example" you can search for "''Tag: example''" or just for "''@example''". Since tags are cached in the index, this search is much quicker than a full text search for random words.
+
+There is also a plugin that will add a tag cloud and a page index organized by tag in the side page, see also [[Plugins:Tags]]

=== modified file 'data/manual/Help/Templates.txt'
--- data/manual/Help/Templates.txt	2010-03-03 19:43:13 +0000
+++ data/manual/Help/Templates.txt	2011-06-04 21:27:03 +0000
@@ -55,20 +55,32 @@
 Available variables:
 
 '''
+zim.version		# version of zim
+
 page.name		# complete page name
 page.namespace		# namespace
-page.title		# last part of the name of the page
-page.heading		# title or first heading in the page
-page.body		# content of the page
-page.links		# list of vars with a .file and a .name subvar
-page.backlinks		# "" idem ""
-page.is_index		# true for the automatic generated index page
-prev.name		# name of previous page
-prev.file		# file name of previous page
-next.name		# name of next page
-next.file		# file name of next page
-notebook.root		# root dir relative to page file
-zim.version		# version of zim
-'''
-
-The "Title" field contains either the first heading in the page or the page name. If the first header is used, this header is removed from the "Body" field.
+page.basename		# last part of the page name
+page.title		# 
+'''
+''first heading in the page or the basename''
+''page.heading		# first heading in the page''
+''page.body		# content of the page (without the leading heading)''
+''page.links		# list of page objects for pages linked in this page''
+''page.backlinks		# ''''list of page objects for pages linking to this page''
+''page.properties		# dict with page properties''
+
+''# These special pages have the same properties as the 'page' object''
+''pages.index		# the index page generated when exporting''
+''pages.home		# the home page''
+''pages.next		# the next page in the index (if any)''
+''pages.previous		# the previous page in the index (if any)''
+
+''options			# dict where format specific options can be set''
+
+Functions available:
+
+'''
+url(link)			# turns a zim link into an URL
+strftime(template, date)	# format a date
+'''
+

=== modified file 'data/manual/Plugins.txt'
--- data/manual/Plugins.txt	2010-07-06 20:36:53 +0000
+++ data/manual/Plugins.txt	2011-06-04 21:27:03 +0000
@@ -6,11 +6,14 @@
 The following plugins are standard included with zim:
 
 * [[+Calendar|Calendar]]
+* [[+Tags|Tags]]
 * [[+Diagram Editor|Diagram Editor]]
 * [[+Equation Editor|Equation Editor]]
 * [[+GNU R Plot Editor|GNU R Plot Editor]]
+* [[+Gnuplot Editor|Gnuplot Editor]]
 * [[+Insert Screenshot|Insert Screenshot]]
 * [[+Insert Symbol|Insert Symbol]]
+* [[+Inline Calculator|Inline Calculator]]
 * [[+Link Map|Link Map]]
 * [[+Quick Note|Quick Note]]
 * [[+Spell Checker|Spell Checker]]

=== added directory 'data/manual/Plugins/Gnuplot_Editor'
=== added file 'data/manual/Plugins/Gnuplot_Editor.txt'
--- data/manual/Plugins/Gnuplot_Editor.txt	1970-01-01 00:00:00 +0000
+++ data/manual/Plugins/Gnuplot_Editor.txt	2011-06-04 21:27:03 +0000
@@ -0,0 +1,21 @@
+Content-Type: text/x-zim-wiki
+Wiki-Format: zim 0.4
+Creation-Date: 2011-03-28T21:59:01+02:00
+
+====== Gnuplot Editor ======
+
+
+The Gnuplot editor is, as its name suggests, a simple dialog that allows you to insert plots rendered with gnuplot.
+
+**Dependencies:** The plugin requires gnuplot to be installed.
+
+===== Syntax =====
+
+{{./gnuplot.png?type=gnuplot}}
+'''
+
+plot sin(x), cos(x)
+'''
+
+
+See http://www.gnuplot.info/ for more information about gnuplot

=== added file 'data/manual/Plugins/Gnuplot_Editor/gnuplot.gnu'
--- data/manual/Plugins/Gnuplot_Editor/gnuplot.gnu	1970-01-01 00:00:00 +0000
+++ data/manual/Plugins/Gnuplot_Editor/gnuplot.gnu	2011-06-04 21:27:03 +0000
@@ -0,0 +1,1 @@
+plot sin(x), cos(x)
\ No newline at end of file

=== added file 'data/manual/Plugins/Gnuplot_Editor/gnuplot.png'
Binary files data/manual/Plugins/Gnuplot_Editor/gnuplot.png	1970-01-01 00:00:00 +0000 and data/manual/Plugins/Gnuplot_Editor/gnuplot.png	2011-06-04 21:27:03 +0000 differ
=== modified file 'data/manual/Plugins/Spell_Checker.txt'
--- data/manual/Plugins/Spell_Checker.txt	2010-05-02 12:46:50 +0000
+++ data/manual/Plugins/Spell_Checker.txt	2011-06-04 21:27:03 +0000
@@ -5,4 +5,7 @@
 
 This plugin adds inline spell checking for zim. It has a preference setting to determine the language used for spell checking. If this is not set, the system default is used.
 
-**Dependencies:** This plugin requires the "gtkspell" library to be installed as well as the Python language bindings for this library. On Ubuntu or Debian systems installing the package "python-gtkspell" (or "python-gnome2-extras" on older releases) will meet these dependencies.
+**Dependencies:** This plugin requires the "gtkspell" library to be installed as well as the Python language bindings for this library. 
+
+* On Ubuntu or Debian systems installing the package "python-gtkspell" (or "python-gnome2-extras" on older releases) will meet these dependencies.
+* On Fedora systems, installing the package "gnome-python2-gtkspell" will meet these dependencies.

=== added file 'data/manual/Plugins/Tags.txt'
--- data/manual/Plugins/Tags.txt	1970-01-01 00:00:00 +0000
+++ data/manual/Plugins/Tags.txt	2011-06-04 21:27:03 +0000
@@ -0,0 +1,13 @@
+Content-Type: text/x-zim-wiki
+Wiki-Format: zim 0.4
+Creation-Date: 2011-04-04T21:14:50+02:00
+
+====== Tags ======
+
+This plugin adds a tag cloud and a page index organized by tags in the side pane. 
+
+The tag cloud allows toggling the selection of tags that is shown in the page index. The page index can be switched between a flat view, showing all pages that match the filtering criteria, and an ordered view that shows known tags as the top level nodes with pages beneath them.
+
+**Dependencies:** This plugin has no additional dependencies.
+
+**See also: **[[Help:Tags]]

=== modified file 'data/manual/Plugins/Task_List.txt'
--- data/manual/Plugins/Task_List.txt	2010-05-25 19:47:41 +0000
+++ data/manual/Plugins/Task_List.txt	2011-06-04 21:27:03 +0000
@@ -35,7 +35,7 @@
 yyyy/mm/dd	yyyy-mm-dd
 '''
 
-So you can use e.g. "[d: 5/1]", "[d: 2010-1-5]" or "[d: 5/1/10]".
+So you can use e.g. "[d: 5/1]", "[d: 2010-1-5]" or "[d: 5/1/10]". (Any other separator character to separate year, month, and day will also work, as long as it is not a number or a letter.)
 
 **Note: **dates are parse in European notation, so "dd/mm", not as "mm/dd" as is customary in the US. Unfortunately there is no way to resolve these unambiguously.
 

=== modified file 'data/menubar.xml'
--- data/menubar.xml	2011-02-14 20:22:50 +0000
+++ data/menubar.xml	2011-06-04 21:27:03 +0000
@@ -42,7 +42,7 @@
 			<menuitem action='edit_object'/>
 			<menuitem action='remove_link'/>
 			<separator/>
-			<placeholder name='edit_page'/>
+			<placeholder name='plugin_items'/>
 			<separator/>
 			<menuitem action='copy_location'/>
 			<separator/>
@@ -72,6 +72,10 @@
 			<separator/>
 			<placeholder name='plugin_items'/>
 			<separator/>
+			<menuitem action='zoom_in'/>
+			<menuitem action='zoom_out'/>
+			<menuitem action='zoom_reset'/>
+			<separator/>
 			<menuitem action='reload_page'/>
 		</menu>
 		<menu action='insert_menu'>

=== modified file 'data/style.conf'
--- data/style.conf	2011-01-16 21:57:51 +0000
+++ data/style.conf	2011-06-04 21:27:03 +0000
@@ -38,6 +38,9 @@
 foreground = blue
 #underline  = single
 
+[Tag tag]
+foreground = #ce5c00
+
 
 # For the various headings we scale the size relative to the font size.
 # The color choosen is the dark green -or "Chameleon"- as defined in the 

=== added file 'data/templates/_gnuplot.gnu'
--- data/templates/_gnuplot.gnu	1970-01-01 00:00:00 +0000
+++ data/templates/_gnuplot.gnu	2011-06-04 21:27:03 +0000
@@ -0,0 +1,5 @@
+set term png
+set output '[% png_fname %]'
+
+[% gnuplot_script %]
+

=== modified file 'data/urls.list'
--- data/urls.list	2010-01-08 18:02:36 +0000
+++ data/urls.list	2011-06-04 21:27:03 +0000
@@ -21,7 +21,7 @@
 google    http://www.google.com/search?q=
 google.de http://www.google.de/search?q=
 phpfn     http://www.php.net/{NAME}
-go        http://www.google.com/search?q={URL}&amp;btnI=lucky
+go        http://www.google.com/search?q={URL}&btnI=lucky
 cpan      http://search.cpan.org/search?query={URL}&mode=all
 perldoc   http://perldoc.perl.org/search.html?q=
 

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-19 16:27:44 +0000
+++ debian/changelog	2011-06-04 21:27:03 +0000
@@ -1,3 +1,15 @@
+zim (0.52) maverick; urgency=low
+
+  * Updated to release 0.52
+
+ -- Jaap Karssenberg <[e-mail]>  Thu, 28 Apr 2011 19:56:04 +0200
+
+zim (0.51) maverick; urgency=low
+
+  * Updated to release 0.51
+
+ -- Jaap Karssenberg <[e-mail]>  Tue, 19 Apr 2011 20:51:32 +0200
+
 zim (0.50) maverick; urgency=low
 
   * Updated to release 0.50 

=== modified file 'debian/control'
--- debian/control	2011-02-19 16:27:44 +0000
+++ debian/control	2011-06-04 21:27:03 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Jaap Karssenberg <[e-mail]>
 Standards-Version: 3.9.1
-Build-Depends: debhelper (>= 7.4.12), cdbs, python-support (>= 0.8), xdg-utils, python (>= 2.5), libgtk2.0-0 (>= 2.6), python-gtk2, python-xdg, python-simplejson | python (>= 2.6)
+Build-Depends: debhelper (>= 7.4.12), cdbs, python-support (>= 0.8), python-unittest2 | python (>= 2.7), xdg-utils, python (>= 2.5), libgtk2.0-0 (>= 2.6), python-gtk2, python-xdg, python-simplejson | python (>= 2.6)
 
 Package: zim
 Architecture: all

=== modified file 'debian/pyversions'
--- debian/pyversions	2009-10-21 18:34:17 +0000
+++ debian/pyversions	2011-06-04 21:27:03 +0000
@@ -1,1 +1,1 @@
-2.5,2.6
+2.5,2.6,2.7

=== modified file 'msgfmt.py'
--- msgfmt.py	2009-07-18 13:57:52 +0000
+++ msgfmt.py	2011-06-04 21:27:03 +0000
@@ -71,7 +71,6 @@
         offsets.append((len(ids), len(_id), len(strs), len(MESSAGES[_id])))
         ids += _id + '\0'
         strs += MESSAGES[_id] + '\0'
-    output = ''
     # The header is 7 32-bit unsigned integers.  We don't use hash tables, so
     # the keys start right after the index tables.
     # translated string.

=== modified file 'test.py'
--- test.py	2011-02-19 16:27:44 +0000
+++ test.py	2011-06-04 21:27:03 +0000
@@ -2,6 +2,10 @@
 
 # -*- coding: utf-8 -*-
 
+# This is a wrapper script to run tests using the unittest
+# framework. It setups the environment properly and defines some
+# commandline options for running tests.
+#
 # Copyright 2008 Jaap Karssenberg <[e-mail]>
 
 import os
@@ -10,92 +14,8 @@
 import getopt
 import logging
 
-import unittest
-import time
-import types
-
 import tests
-
-# TODO overload one of the unittest classes to test add file names
-
-pyfiles = []
-for d, dirs, files in os.walk('zim'):
-	pyfiles.extend([d+'/'+f for f in files if f.endswith('.py')])
-pyfiles.sort()
-
-class FastTestLoader(unittest.TestLoader):
-	'''Extension of TestLoader which ignores all classes which have an
-	attribute 'slowTest' set to True.
-	'''
-
-	def __init__(self, alltests=True):
-		unittest.TestLoader.__init__(self)
-		self.ignored = 0
-		self.skipped = 0
-		self.alltests = alltests
-
-	def loadTestsFromModule(self, module):
-		"""Return a suite of all tests cases contained in the given module"""
-		tests = []
-		for name in dir(module):
-			obj = getattr(module, name)
-			if (isinstance(obj, (type, types.ClassType)) and
-				issubclass(obj, unittest.TestCase)):
-				if not self.alltests and hasattr(obj, 'slowTest') and obj.slowTest:
-					print 'Ignoring slow test:', obj.__name__
-					self.ignored += 1
-				elif hasattr(obj, 'skipTest') and obj.skipTest():
-					print 'Skipping test:', obj.__name__, '-', obj.skipTest()
-					self.skipped += 1
-				else:
-					tests.append(self.loadTestsFromTestCase(obj))
-		return self.suiteClass(tests)
-
-
-class MyTextTestRunner(unittest.TextTestRunner):
-	'''Extionsion of TextTestRunner to report number of ignored tests in the
-	proper place.
-	'''
-
-	def __init__(self, verbosity, ignored, skipped):
-		unittest.TextTestRunner.__init__(self, verbosity=verbosity)
-		self.ignored = ignored
-		self.skipped = skipped
-
-	def run(self, test):
-		"Run the given test case or test suite."
-		result = self._makeResult()
-		startTime = time.time()
-		test(result)
-		stopTime = time.time()
-		timeTaken = stopTime - startTime
-		result.printErrors()
-		self.stream.writeln(result.separator2)
-		run = result.testsRun
-		self.stream.writeln("Ran %d test%s in %.3fs" %
-							(run, run != 1 and "s" or "", timeTaken))
-		ignored = self.ignored
-		if ignored > 0:
-			self.stream.writeln("Ignored %d slow test%s" %
-							(ignored, ignored != 1 and "s" or ""))
-		skipped = self.skipped
-		if skipped > 0:
-			self.stream.writeln("Skipped %d test%s" %
-							(skipped, skipped != 1 and "s" or ""))
-		self.stream.writeln()
-		if not result.wasSuccessful():
-			self.stream.write("FAILED (")
-			failed, errored = map(len, (result.failures, result.errors))
-			if failed:
-				self.stream.write("failures=%d" % failed)
-			if errored:
-				if failed: self.stream.write(", ")
-				self.stream.write("errors=%d" % errored)
-			self.stream.writeln(")")
-		else:
-			self.stream.writeln("OK")
-		return result
-
+from tests import unittest
 
 
 def main(argv=None):
@@ -105,9 +25,10 @@
 
 	# parse options
 	coverage = None
-	alltests = True
+	failfast = False
 	loglevel = logging.WARNING
-	opts, args = getopt.gnu_getopt(argv[1:], 'hVD', ['help', 'coverage', 'fast', 'debug', 'verbose'])
+	opts, args = getopt.gnu_getopt(argv[1:],
+		'hVD', ['help', 'coverage', 'fast', 'failfast', 'debug', 'verbose'])
 	for o, a in opts:
 		if o in ('-h', '--help'):
 			print '''\
@@ -118,7 +39,8 @@
 
 Options:
   -h, --help     print this text
-  --fast         skip a number of slower tests
+  --fast         skip a number of slower tests (assumes --failfast)
+  --failfast     stop after the first test that fails
   --coverage     report test coverage statistics
   -V, --verbose  run with verbose output from logging
   -D, --debug    run with debug output from logging
@@ -129,7 +51,7 @@
 				import coverage as coverage_module
 			except ImportError:
 				print >>sys.stderr, '''\
-Can not run test coverage without module coverage.
+Can not run test coverage without module 'coverage'.
 On Ubuntu or Debian install package 'python-coverage'.
 '''
 				sys.exit(1)
@@ -139,7 +61,11 @@
 			coverage.exclude('raise NotImplementedError')
 			coverage.start()
 		elif o == '--fast':
-			alltests = False
+			failfast = True
+			tests.FAST_TEST = True
+				# set before any test classes are loaded !
+		elif o == '--failfast':
+			failfast = True
 		elif o in ('-V', '--verbose'):
 			loglevel = logging.INFO
 		elif o in ('-D', '--debug'):
@@ -150,28 +76,19 @@
 	# Set logging handler
 	logging.basicConfig(level=loglevel, format='%(levelname)s: %(message)s')
 
-	# Set environment - so we can be sure we don't see
-	# any data from a previous installed version
-	tests.set_environ()
-
-	# Collect the test cases
-	suite = unittest.TestSuite()
-	loader = FastTestLoader(alltests=alltests)
-
+	# Build the test suite
+	loader = unittest.TestLoader()
 	if args:
-		modules = [ 'tests.'+name for name in args ]
+		suite = unittest.TestSuite()
+		for module in [ 'tests.'+name for name in args ]:
+			test = loader.loadTestsFromName(module)
+			suite.addTest(test)
 	else:
-		suite.addTest(TestCompileAll())
-		suite.addTest(TestNotebookUpgrade())
-		modules = [ 'tests.'+name for name in tests.__all__ ]
-
-	for name in modules:
-		test = loader.loadTestsFromName(name)
-		suite.addTest(test)
-
-	# And run them
-	MyTextTestRunner(verbosity=3,
-		ignored=loader.ignored, skipped=loader.skipped).run(suite)
+		suite = tests.load_tests(loader, None, None)
+
+	# And run it
+	unittest.installHandler() # Fancy handling for ^C during test
+	unittest.TextTestRunner(verbosity=2, failfast=failfast).run(suite)
 
 	# Check the modules were loaded from the right location
 	# (so no testing based on modules from a previous installed version...)
@@ -184,6 +101,7 @@
 				assert file.startswith(mylib), \
 					'Module %s was loaded from %s' % (module, file)
 
+	# Create coverage output if asked to do so
 	if coverage:
 		coverage.stop()
 		report_coverage(coverage)
@@ -192,6 +110,7 @@
 def report_coverage(coverage):
 	print ''
 	print 'Writing detailed coverage reports...'
+	pyfiles = list(tests.zim_pyfiles())
 	coverage.report(pyfiles, show_missing=False)
 
 	# Detailed report in html
@@ -307,25 +226,6 @@
 	print '\nDetailed coverage reports can be found in ./coverage/'
 
 
-class TestCompileAll(unittest.TestCase):
-
-	def runTest(self):
-		'''Test if all modules compile'''
-		for file in pyfiles:
-			module = file[:-3].replace('/', '.')
-			assert __import__(module)
-
-
-class TestNotebookUpgrade(unittest.TestCase):
-
-	def runTest(self):
-		'''Test if included notebooks are up to date'''
-		from zim.fs import Dir
-		from zim.notebook import get_notebook
-		for path in ('data/manual', 'HACKING'):
-			notebook = get_notebook(Dir(path))
-			self.assertTrue(not notebook.needs_upgrade)
-
 
 if __name__ == '__main__':
 	main()

=== modified file 'tests/__init__.py'
--- tests/__init__.py	2011-02-27 20:51:16 +0000
+++ tests/__init__.py	2011-06-04 21:27:03 +0000
@@ -7,14 +7,36 @@
 import os
 import sys
 import shutil
-import unittest
 import logging
 import gettext
 import xml.etree.cElementTree as etree
-
-
+import types
+import glob
+
+if sys.version_info < (2, 7, 0):
+	try:
+		import unittest2 as unittest
+	except ImportError:
+		print >>sys.stderr, '''\
+For python versions < 2.7 the 'unittest2' module is needed to run
+the test suite. On Ubuntu or Debian install package 'python-unittest2'.
+'''
+		sys.exit(1)
+else:
+	import unittest
+
+from unittest import skip, skipIf, skipUnless
+
+__unittest = 1 # needed to get stack trace OK for class TestCase
+
+gettext.install('zim', unicode=True, names=('_', 'gettext', 'ngettext'))
+
+FAST_TEST = False #: determines whether we skip slow tests or not
+
+
+# This list also determines the order in which tests will executed
 __all__ = [
-	'coding', 'translations',
+	'package', 'translations',
 	'errors', 'parsing', 'fs', 'config', 'applications', 'async',
 	'formats', 'templates', 'inlineobjects',
 	'stores', 'index', 'notebook',
@@ -22,17 +44,33 @@
 	'export', 'www', 'search',
 	'widgets', 'gui', 'pageview',
 	'calendar', 'printtobrowser', 'versioncontrol', 'inlinecalculator',
-	'tasklist',
+	'tasklist', 'tags',
 	'equationeditor', 'diagrameditor',
+	'daemon' # Note that running this test in another position can skrew up e.g. clipboard test
 ]
 
-__unittest = 1 # needed to get stack trace OK for class TestCase
-
-
-gettext.install('zim', unicode=True, names=('_', 'gettext', 'ngettext'))
-
-
-def set_environ():
+# when a test is missing from the list that should be detected
+for file in glob.glob(os.path.dirname(__file__) + '/*.py'):
+	name = os.path.basename(file)[:-3]
+	if name != '__init__' and not name in __all__:
+		raise AssertionError, 'Test missing in __all__: %s' % name
+
+
+def load_tests(loader, tests, pattern):
+	'''Load all test cases and return a unittest.TestSuite object.
+	The parameters 'tests' and 'pattern' are ignored.
+	'''
+	suite = unittest.TestSuite()
+	for name in ['tests.'+name for name in __all__ ]:
+		test = loader.loadTestsFromName(name)
+		suite.addTest(test)
+	return suite
+
+
+def _setUpEnvironment():
+	'''Method to be run once before test suite starts'''
+	# In fact to be loaded before loading some of the zim modules
+	# like zim.config and any that export constants from it
 	tmpdir = './tests/tmp/'
 	os.environ.update({
 		'ZIM_TEST_RUNNING': 'True',
@@ -55,75 +93,218 @@
 	os.makedirs(hicolor)
 
 
-def create_tmp_dir(name):
-	'''Returns a path to a tmp dir for tests to store dump data.
-	The dir is removed and recreated empty every time this function
-	is called.
+_setUpEnvironment() # just do this whenever we are loaded
+
+
+_zim_pyfiles = []
+
+def zim_pyfiles():
+	'''Returns a list with file paths for all the zim python files'''
+	if not _zim_pyfiles:
+		for d, dirs, files in os.walk('zim'):
+			_zim_pyfiles.extend([d+'/'+f for f in files if f.endswith('.py')])
+		_zim_pyfiles.sort()
+	for file in _zim_pyfiles:
+		yield file # shallow copy
+
+
+
+def gtk_process_events(*a):
+	'''Method to simulate a few iterations of the gtk main loop'''
+	import gtk
+	while gtk.events_pending():
+		gtk.main_iteration(block=False)
+	return True # continue
+
+
+def slowTest(obj):
+	'''Decorator for slow tests
+
+	Tests wrapped with this decorator are ignored when you run
+	C{test.py --fast}. You can either wrap whole test classes::
+
+		@tests.slowTest
+		class MyTest(tests.TestCase):
+			...
+
+	or individual test functions::
+
+		class MyTest(tests.TestCase):
+
+			@tests.slowTest
+			def testFoo(self):
+				...
+
+			def testBar(self):
+				...
 	'''
-	dir = os.path.join('tests', 'tmp', name)
-	if os.name == 'nt':
-		dir = unicode(dir)
+	if FAST_TEST:
+		wrapper = skip('Slow test')
+		return wrapper(obj)
 	else:
-		dir = dir.encode(sys.getfilesystemencoding())
-	if os.path.exists(dir):
-		shutil.rmtree(dir)
-	assert not os.path.exists(dir) # make real sure
-	os.makedirs(dir)
-	assert os.path.exists(dir) # make real sure
-	return dir
-
-
-_test_data_wiki = None
-
-def get_test_data(format):
-	global _test_data_wiki
-	assert format == 'wiki' # No other formats available for now
-	if _test_data_wiki is None:
-		_test_data_wiki = _get_test_data_wiki()
-
-	for name, text in _test_data_wiki:
-		#~ print '>', name
-		yield name, text
-
-
-def get_test_data_page(format, name):
-	global _test_data_wiki
-	assert format == 'wiki' # No other formats available for now
-	if not _test_data_wiki:
-		_test_data_wiki = _get_test_data_wiki()
-
-	for n, text in _test_data_wiki:
-		if n == name:
-			return text
-	assert False, 'Could not find data for page: %s' % name
-
-
-def _get_test_data_wiki():
-	test_data = []
-	tree = etree.ElementTree(file='tests/data/notebook-wiki.xml')
-	for node in tree.getiterator(tag='page'):
-		name = node.attrib['name']
-		text = unicode(node.text.lstrip('\n'))
-		test_data.append((name, text))
-	return tuple(test_data)
-
-
-def get_test_notebook(format='wiki'):
-	'''Returns a notebook with a memory store and some test data'''
-	from zim.notebook import Notebook, Path
-	from zim.index import Index
-	notebook = Notebook(index=Index(dbfile=':memory:'))
-	store = notebook.add_store(Path(':'), 'memory')
-	manifest = []
-	for name, text in get_test_data(format):
-		manifest.append(name)
-		store.set_node(Path(name), text)
-	notebook.testdata_manifest = expand_manifest(manifest)
-	notebook.index.update()
-	return notebook
-
-
-def expand_manifest(names):
+		return obj
+
+
+class TestCase(unittest.TestCase):
+	'''Base class for test cases'''
+
+	def create_tmp_dir(self, name=None):
+		'''Returns a path to a tmp dir where tests can write data.
+		The dir is removed and recreated empty every time this function
+		is called with the same name from the same class.
+		'''
+		path = self._get_tmp_name(name)
+		if os.path.exists(path):
+			shutil.rmtree(path)
+		assert not os.path.exists(path) # make real sure
+		os.makedirs(path)
+		assert os.path.exists(path) # make real sure
+		return path
+
+	def get_tmp_name(self, name=None):
+		'''Returns the same path as L{create_tmp_dir()} but without
+		touching it. This method will raise an exception when a file
+		or dir exists of the same name.
+		'''
+		path = self._get_tmp_name(name)
+		assert not os.path.exists(path), 'This path should not exist: %s' % path
+		return path
+
+	def _get_tmp_name(self, name):
+		if name:
+			assert not os.path.sep in name, 'Don\'t use this method to get sub folders or files'
+			name = self.__class__.__name__ + '_' + name
+		else:
+			name = self.__class__.__name__
+
+		dir = os.path.dirname(__file__)
+		path = os.path.join(dir, 'tmp', name)
+		if os.name == 'nt':
+			path = unicode(path)
+		else:
+			path = path.encode(sys.getfilesystemencoding())
+
+		return path
+
+
+class LoggingFilter(object):
+	'''Base class for logging filters that can be used as a context
+	using the "with" keyword. To subclass it you only need to set the
+	logger to be used and (the begin of) the message to filter.
+	'''
+
+	logger = None
+	message = None
+
+	def __init__(self, logger=None, message=None):
+		if logger: self.logger = logger
+		if message: self.message = message
+
+		self.loggerobj = logging.getLogger(self.logger)
+
+	def __enter__(self):
+		self.loggerobj.addFilter(self)
+
+	def __exit__(self, *a):
+		self.loggerobj.removeFilter(self)
+
+	def filter(self, record):
+		return not record.getMessage().startswith(self.message)
+
+
+class DialogContext(object):
+	'''Context manager to catch dialogs being opened
+
+	Inteded to be used like this::
+
+		def myCustomTest(dialog):
+			self.assertTrue(isinstance(dialog, CustomDialogClass))
+			# ...
+			dialog.assert_response_ok()
+
+		with DialogContext(
+			myCustomTest,
+			SomeOtherDialogClass
+		):
+			gui.show_dialogs()
+
+	In this example the first dialog that is run by C{gui.show_dialogs()}
+	is checked by the function C{myCustomTest()} while the second dialog
+	just needs to be of class C{SomeOtherDialogClass} and will then
+	be closed with C{assert_response_ok()} by the context manager.
+
+	This context only works for dialogs derived from zim's Dialog class
+	as it uses a special hook in L{zim.gui.widgets}.
+	'''
+
+	def __init__(self, *definitions):
+		'''Constructor
+		@param definitions: list of either classes or methods
+		'''
+		self.stack = list(definitions)
+		self.old_test_mode = None
+
+	def __enter__(self):
+		import zim.gui.widgets
+		self.old_test_mode = zim.gui.widgets.TEST_MODE
+		self.old_callback = zim.gui.widgets.TEST_MODE_RUN_CB
+		zim.gui.widgets.TEST_MODE = True
+		zim.gui.widgets.TEST_MODE_RUN_CB = self._callback
+
+	def _callback(self, dialog):
+		#~ print '>>>', dialog
+		if not self.stack:
+			raise AssertionError, 'Unexpected dialog run: %s' % dialog
+
+		handler = self.stack.pop(0)
+
+		if isinstance(handler, (type, types.ClassType)): # is a class
+			if not isinstance(dialog, handler):
+				raise AssertionError, 'Expected dialog of class %s, but got %s instead' % (handler, dialog.__class__)
+			dialog.assert_response_ok()
+		else: # assume a function
+			handler(dialog)
+
+	def __exit__(self, *error):
+		#~ print 'ERROR', error
+		import zim.gui.widgets
+		zim.gui.widgets.TEST_MODE = self.old_test_mode
+		zim.gui.widgets.TEST_MODE_RUN_CB = self.old_callback
+		return False # Raise any errors again outside context
+
+
+class TestData(object):
+	'''Wrapper for a set of test data in tests/data'''
+
+	def __init__(self, format):
+		assert format == 'wiki', 'TODO: add other formats'
+		tree = etree.ElementTree(file='tests/data/notebook-wiki.xml')
+
+		test_data = []
+		for node in tree.getiterator(tag='page'):
+			name = node.attrib['name']
+			text = unicode(node.text.lstrip('\n'))
+			test_data.append((name, text))
+
+		self._test_data = tuple(test_data)
+
+	def __iter__(self):
+		'''Yield the test data as 2 tuple (pagename, text)'''
+		for name, text in self._test_data:
+			yield name, text # shallow copy
+
+	def get(self, pagename):
+		'''Return text for a specific pagename'''
+		for n, text in self._test_data:
+			if n == pagename:
+				return text
+		assert False, 'Could not find data for page: %s' % pagename
+
+
+WikiTestData = TestData('wiki') #: singleton to be used by various tests
+
+
+def _expand_manifest(names):
 	'''Build a set of all pages names and all namespaces that need to
 	exist to host those page names.
 	'''
@@ -137,96 +318,63 @@
 	return manifest
 
 
-def get_test_page(name='Foo'):
-	'''FIXME'''
+def new_notebook(fakedir=None):
+	'''Returns a new Notebook object with all data in memory
+
+	Uses data from L{WikiTestData}
+
+	@param fakedir: optional parameter to set the 'dir' attribute for
+	the notebook and the main store which allows you to resolve file
+	paths etc. It will not automatically touch the dir
+	(hence it being 'fake').
+	'''
+	from zim.fs import Dir
 	from zim.notebook import Notebook, Path
-	notebook = Notebook()
-	notebook.add_store(Path(':'), 'memory')
-	return notebook, notebook.get_page(Path(name))
-
-
-def print_index(index):
-	print '==== INDEX ===='
-	for page in index.walk():
-		print page.name, page.hascontent, page.haschildren
-		for link in index.list_links(page):
-			print '\t->', link.href.name
-	print '==============='
-
-
-
-class TestCase(unittest.TestCase):
-	'''Base class for test cases'''
-
-	def run(self, *args):
-		unittest.TestCase.run(self, *args)
-
-	def assertEqualDiff(self, first, second, msg=None):
-		'''Fail if the two strings are unequal as determined by
-		the '==' operator. On failure shows a diff of both strings.
-		Alternatively the arguments can be lists of lines.
-		'''
-		if msg is None:
-			msg = u'Strings differ:'
-		else:
-			msg = unicode(msg)
-
-		if not type(first) == type(second):
-			types = type(first), type(second)
-			msg += ' types differ, %s and %s' % types
-		elif not first:
-			msg += ' first text is empty'
-		elif not second:
-			msg += ' second text is empty'
-		elif not first == second:
-			from difflib import Differ
-			if isinstance(first, basestring):
-				first = first.splitlines(True)
-			if isinstance(second, basestring):
-				second = second.splitlines(True)
-			diff = Differ().compare(second, first)
-			# switching first and second, because usually second
-			# is the reference we are testing against
-			msg += '\n' + ''.join(diff)
-		else:
-			return
-
-		raise self.failureException, msg.encode('utf-8')
-
-	def assertEqualDiffData(self, first, second, msg=None):
-		'''Like assertEqualDiff(), but handles sets and other
-		data types that can be cast to lists.
-		'''
-		if msg is None:
-			msg = u'Values differ:'
-		else:
-			msg = unicode(msg)
-
-		if not type(first) == type(second):
-			types = type(first), type(second)
-			msg += ' types differ, %s and %s' % types
-		elif first is None:
-			msg += ' first item is "None"'
-		elif second is None:
-			msg += ' second item is "None"'
-		elif not first == second:
-			from difflib import Differ
-			if isinstance(first, set):
-				first = list(first)
-				second = list(second)
-				first.sort()
-				second.sort()
-			else:
-				first = list(first)
-				second = list(second)
-			diff = Differ().compare(second, first)
-			# switching first and second, because usually second
-			# is the reference we are testing against
-			msg += '\n' + '\n'.join(diff)
-		else:
-			return
-
-		raise self.failureException, msg.encode('utf-8')
+	from zim.index import Index
+
+	notebook = Notebook(index=Index(dbfile=':memory:'))
+	store = notebook.add_store(Path(':'), 'memory')
+	manifest = []
+	for name, text in WikiTestData:
+		manifest.append(name)
+		store.set_node(Path(name), text)
+	notebook.testdata_manifest = _expand_manifest(manifest)
+	notebook.index.update()
+
+	if fakedir:
+		dir = Dir(fakedir)
+		notebook.dir = dir
+		store.dir = dir
+
+	return notebook
+
+
+def new_files_notebook(dir):
+	'''Returns a new Notebook object with a file store
+
+	Uses data from L{WikiTestData}
+
+	@param path: a folder path, e.g. created by L{TestCase.create_tmp_dir()}
+	'''
+	from zim.fs import Dir
+	from zim.notebook import init_notebook, Notebook, Path
+	from zim.index import Index
+
+	dir = Dir(dir)
+	init_notebook(dir)
+	notebook = Notebook(dir=dir)
+	store = notebook.get_store(':')
+	manifest = []
+	for name, text in WikiTestData:
+		manifest.append(name)
+		page = store.get_page(Path(name))
+		page.parse('wiki', text)
+		store.store_page(page)
+	notebook.testdata_manifest = _expand_manifest(manifest)
+	notebook.index.update()
+
+	return notebook
+
 
 
 class MockObject(object):
@@ -260,28 +408,3 @@
 
 		setattr(self, name, my_mock_method)
 		return my_mock_method
-
-
-class LoggingFilter(object):
-	'''Base class for logging filters that can be used as a context
-	using the "with" keyword. To subclass it you only need to set the
-	logger to be used and (the begin of) the message to filter.
-	'''
-
-	logger = None
-	message = None
-
-	def __init__(self, logger=None, message=None):
-		if logger: self.logger = logger
-		if message: self.message = message
-
-		self.loggerobj = logging.getLogger(self.logger)
-
-	def __enter__(self):
-		self.loggerobj.addFilter(self)
-
-	def __exit__(self, *a):
-		self.loggerobj.removeFilter(self)
-
-	def filter(self, record):
-		return not record.getMessage().startswith(self.message)

=== modified file 'tests/applications.py'
--- tests/applications.py	2011-02-19 16:27:44 +0000
+++ tests/applications.py	2011-06-04 21:27:03 +0000
@@ -1,10 +1,8 @@
-
 # -*- coding: utf-8 -*-
 
 # Copyright 2009 Jaap Karssenberg <[e-mail]>
 
 import tests
-from tests import TestCase, create_tmp_dir
 
 import os
 import gtk
@@ -22,7 +20,7 @@
 	return tuple(l)
 
 
-class TestApplications(TestCase):
+class TestApplications(tests.TestCase):
 
 	def testParseExec(self):
 		'''Test parsing of .desktop Exec strings'''
@@ -76,7 +74,8 @@
 			self.assertEqual(result, wanted)
 
 
-class TestCustomTools(TestCase):
[e-mail]
+class TestCustomTools(tests.TestCase):
 
 	def testManager(self):
 		'''Test CustomToolManager API'''
@@ -166,15 +165,14 @@
 		# %t for selected text or word under cursor
 		# %T for selected text or word under cursor with wiki format
 
-		notebook = tests.get_test_notebook()
+		path = self.get_tmp_name()
+		notebook = tests.new_notebook(fakedir=path)
 		page = notebook.get_page(Path('Test:Foo'))
 		pageview = StubPageView()
 		args = (notebook, page, pageview)
 
 		tmpfile = TmpFile('tmp-page-source.txt').path
-		dir = Dir(tests.create_tmp_dir('applications_TestCustomTools'))
-		notebook.dir = dir # fake file store
-		notebook._stores[''].dir = dir # fake file store
+		dir = notebook.dir
 
 		tool = CustomToolDict()
 		tool.update( {

=== modified file 'tests/async.py'
--- tests/async.py	2011-02-19 16:27:44 +0000
+++ tests/async.py	2011-06-04 21:27:03 +0000
@@ -9,6 +9,7 @@
 
 import tests
 
+import time
 
 from zim.async import *
 from zim.fs import File
@@ -31,10 +32,11 @@
 
 			self.assertEqual(value, 'foo bar')
 
+	@tests.slowTest
 	def testFS(self):
 		'''Test async FS operations'''
 
-		self.path = tests.create_tmp_dir('async_testFS')+'/file.txt'
+		self.path = self.create_tmp_dir('testFS')+'/file.txt'
 
 		file = File(self.path)
 
@@ -45,3 +47,31 @@
 		op2.wait()
 
 		self.assertEqual(file.read(), 'foo bar 2\n')
+
+
+class Counter(object):
+
+	def __init__(self):
+		self.i = 0
+
+	def count(self):
+		self.i += 1
+
+
[e-mail]
+class TestDelayedCallback(tests.TestCase):
+
+	def runTest(self):
+		counter = Counter()
+
+		callback = DelayedCallback(500, lambda o: counter.count())
+		for i in range(3):
+			callback('foo')
+
+		for i in range(10):
+			time.sleep(1)
+			tests.gtk_process_events()
+			if callback.timer_id is None:
+				break
+
+		self.assertEqual(counter.i, 1)

=== modified file 'tests/calendar.py'
--- tests/calendar.py	2011-02-19 16:27:44 +0000
+++ tests/calendar.py	2011-06-04 21:27:03 +0000
@@ -1,10 +1,9 @@
-
 # -*- coding: utf-8 -*-
 
 # Copyright 2008 Jaap Karssenberg <[e-mail]>
 
 import tests
-from tests import TestCase
+
 
 from datetime import date as dateclass
 
@@ -13,9 +12,9 @@
 from zim.config import ConfigDict
 
 
-class TestCalendarPlugin(TestCase):
[e-mail]
+class TestCalendarPlugin(tests.TestCase):
 
-	slowTest = True
 
 	def runTest(self):
 		'Test Calendar plugin'
@@ -38,11 +37,11 @@
 	ui_type = 'stub'
 
 	def __init__(self):
-		self.notebook = tests.get_test_notebook()
+		self.notebook = tests.new_notebook()
 		self.page = self.notebook.get_page(Path('Test:foo'))
 		self.preferences = ConfigDict()
 		self.uistate = ConfigDict()
-	
+
 	def connect(*a): pass
 
 	def connect_after(*a): pass

=== modified file 'tests/config.py'
--- tests/config.py	2011-02-19 16:27:44 +0000
+++ tests/config.py	2011-06-04 21:27:03 +0000
@@ -21,6 +21,7 @@
 	message = 'Invalid config value'
 
 
+
 class TestDirsTestSetup(TestCase):
 
 	def runTest(self):
@@ -40,16 +41,22 @@
 class TestDirsDefault(TestCase):
 
 	def setUp(self):
+		old_environ = {}
 		for k in (
 			'XDG_DATA_HOME', 'XDG_DATA_DIRS',
 			'XDG_CONFIG_HOME', 'XDG_CONFIG_DIRS', 'XDG_CACHE_HOME'
 		):
-			if k in os.environ: del os.environ[k]
-
-		zim.config._set_basedirs() # refresh
-
-	def tearDown(self):
-		tests.set_environ() # re-set the environment
+			if k in os.environ:
+				old_environ[k] = os.environ[k]
+				del os.environ[k]
+
+		def restore_environ():
+			for k, v in old_environ.items():
+				os.environ[k] = v
+			zim.config._set_basedirs() # refresh
+
+		self.addCleanup(restore_environ)
+
 		zim.config._set_basedirs() # refresh
 
 	def testValid(self):
@@ -91,14 +98,25 @@
 class TestDirsEnvironment(TestDirsDefault):
 
 	def setUp(self):
-		os.environ.update( (
-			('XDG_DATA_HOME', '/foo/data/home'),
-			('XDG_DATA_DIRS', '/foo/data/dir1:/foo/data/dir2'),
-			('XDG_CONFIG_HOME', '/foo/config/home'),
-			('XDG_CONFIG_DIRS', '/foo/config/dir1:/foo/config/dir2'),
-			('XDG_CACHE_HOME', '/foo/cache')
-		) )
-
+		my_environ = {
+			'XDG_DATA_HOME': '/foo/data/home',
+			'XDG_DATA_DIRS': '/foo/data/dir1:/foo/data/dir2',
+			'XDG_CONFIG_HOME': '/foo/config/home',
+			'XDG_CONFIG_DIRS': '/foo/config/dir1:/foo/config/dir2',
+			'XDG_CACHE_HOME': '/foo/cache',
+		}
+
+		old_environ = dict((name, os.environ.get(name)) for name in my_environ)
+
+		def restore_environ():
+			for k, v in old_environ.items():
+				if v:
+					os.environ[k] = v
+			zim.config._set_basedirs() # refresh
+
+		self.addCleanup(restore_environ)
+
+		os.environ.update(my_environ)
 		zim.config._set_basedirs() # refresh
 
 	def testCorrect(self):
@@ -147,7 +165,7 @@
 none=None
 
 '''
-		self.assertEqualDiff(file.read(), text)
+		self.assertEqual(file.read(), text)
 
 		del conf
 		conf = ConfigDictFile(file)
@@ -336,7 +354,7 @@
 		headers = HeadersDict(text)
 		self.assertEqual(headers['Foobar'], '123')
 		self.assertEqual(headers['More-Lines'], 'test\n1234\ntest')
-		self.assertEqualDiff(headers.dump(), text.splitlines(True))
+		self.assertEqual(headers.dump(), text.splitlines(True))
 
 		moretext='''\
 Foobar: 123
@@ -351,8 +369,8 @@
 		lines = moretext.splitlines(True)
 		headers = HeadersDict()
 		headers.read(lines)
-		self.assertEqualDiff(headers.dump(), text.splitlines(True))
-		self.assertEqualDiff(lines, ['test 123\n', 'test 456\n'])
+		self.assertEqual(headers.dump(), text.splitlines(True))
+		self.assertEqual(lines, ['test 123\n', 'test 456\n'])
 
 		# error tolerance and case insensitivity
 		text = '''\
@@ -420,4 +438,3 @@
 		self.assertEqual(dict[Path('foo:bar:baz')]['key1'], 'foo')
 		dict['']['key2'] = 'FOO'
 		self.assertEqual(dict[Path('foo:bar:baz')]['key2'], 'FOO')
-

=== modified file 'tests/daemon.py'
--- tests/daemon.py	2011-02-19 16:27:44 +0000
+++ tests/daemon.py	2011-06-04 21:27:03 +0000
@@ -4,7 +4,6 @@
 # Copyright 2009 Jaap Karssenberg <[e-mail]>
 
 import tests
-from tests import TestCase
 
 import os
 import time
@@ -27,21 +26,13 @@
 	assert file.exists() == exists, 'File did not (dis-)appear'
 
 
-class TestDaemon(TestCase):
-
-	slowTest = True
-
-	@classmethod
-	def skipTest(klass):
-		if os.name == 'nt':
-			return 'Daemon not supported on Windows'
-		else:
-			return False
-
[e-mail]
[e-mail](os.name == 'nt', 'Daemon not supported on Windows')
+class TestDaemon(tests.TestCase):
 
 	def runTest(self):
 		'''Test GUI daemon interaction'''
-		dir = Dir(tests.create_tmp_dir('daemon'))
+		dir = Dir(self.create_tmp_dir())
 		socket = dir.file('test-socket')
 		pidfile = dir.file('daemon.pid')
 

=== modified file 'tests/data/notebook-wiki.xml'
--- tests/data/notebook-wiki.xml	2010-09-12 21:33:23 +0000
+++ tests/data/notebook-wiki.xml	2011-06-04 21:27:03 +0000
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- this file is NOT in store.xml format -->
 <pagelist>
+<page name="TODOList">
+TEst 123
+</page>
 <page name="TODOList:foo">
 TODO: fix 1 !!!
 
@@ -17,6 +20,15 @@
 
 [[Test:Foo:BAR]]
 </page>
+<page name='TrashMe'>
+Trash me!
+</page>
+<page name='TrashMe:sub page 1'>
+Trash me!
+</page>
+<page name='TrashMe:sub page 2'>
+Trash me!
+</page>
 <page name="Test:wiki">
 Content-Type: text/x-zim-wiki
 Wiki-Format: zim 0.26
@@ -139,6 +151,31 @@
 
 •• Search Me ••
 </page>
+<page name="Test:tags">
+= Tags =
+
+This page contains @tags in all kind of@places like the
+@beginning of a line or its @end
+but also after
+
+	@tabs i.e. within @verbatim blocks
+
+within [[foo:bar|Link @captions]] as well as
+* @enumerations
+
+Not to forget within
+
+== @Headings ==
+
+and
+
+=== Their last @word ===
+
+And with a different &#64;encoding
+
+It also tests which weird @s!gns (sees only "s") and @num6ers @wit#in (aka 
+"wit") tags and tries hard to @cr@sh ("cr") the parser.  
+</page>
 <page name="Test:Foo Bar:Dus Ja Hmm">
 Testing with whitespace in page name
 </page>
@@ -169,6 +206,7 @@
 IMAGE: {{../my-image.png?width=600|Foo Bar}}
 LINKS: [[:foo:bar]] [[./file.png]] file:///etc/passwd
 LINKS: [[Foo]][[Bar]]
+TAGS: @foo @bar
 
 	Some indented
 	paragraphs go here ...

=== modified file 'tests/diagrameditor.py'
--- tests/diagrameditor.py	2011-02-19 16:27:44 +0000
+++ tests/diagrameditor.py	2011-06-04 21:27:03 +0000
@@ -3,20 +3,13 @@
 # Copyright 2009 Jaap Karssenberg <[e-mail]>
 
 import tests
-from tests import TestCase
 
 from zim.plugins.diagrameditor import *
 
-class TestDiagramEditor(TestCase):
-
-	slowTest = True
-
-	@classmethod
-	def skipTest(klass):
-		if not InsertDiagramPlugin.check_dependencies_ok():
-			return 'Missing dependencies'
-		else:
-			return False
+
[e-mail]
[e-mail](InsertDiagramPlugin.check_dependencies_ok(), 'Missing dependencies')
+class TestDiagramEditor(tests.TestCase):
 
 	def runTest(self):
 		'Test Diagram Editor plugin'

=== modified file 'tests/equationeditor.py'
--- tests/equationeditor.py	2011-02-19 16:27:44 +0000
+++ tests/equationeditor.py	2011-06-04 21:27:03 +0000
@@ -3,20 +3,13 @@
 # Copyright 2009 Jaap Karssenberg <[e-mail]>
 
 import tests
-from tests import TestCase
 
 from zim.plugins.equationeditor import *
 
-class TestEquationEditor(TestCase):
-
-	slowTest = True
-
-	@classmethod
-	def skipTest(klass):
-		if not InsertEquationPlugin.check_dependencies_ok():
-			return 'Missing dependencies'
-		else:
-			return False
+
[e-mail]
[e-mail](InsertEquationPlugin.check_dependencies_ok(), 'Missing dependencies')
+class TestEquationEditor(tests.TestCase):
 
 	def runTest(self):
 		'Test Equation Editor plugin'

=== modified file 'tests/export.py'
--- tests/export.py	2011-02-19 16:27:44 +0000
+++ tests/export.py	2011-06-04 21:27:03 +0000
@@ -2,7 +2,8 @@
 
 # Copyright 2009 Jaap Karssenberg <[e-mail]>
 
-from tests import TestCase, MockObject, create_tmp_dir, get_test_notebook, get_test_data
+import tests
+
 
 from subprocess import check_call
 
@@ -12,38 +13,35 @@
 
 # TODO add check that attachments are copied correctly
 
-class TestLinker(TestCase):
+class TestLinker(tests.TestCase):
 
 	def runTest(self):
 		'''Test proper linking of files in export'''
-		notebook = get_test_notebook()
-		notebook.get_store(Path(':')).dir = Dir('/source/dir/') # fake source dir
+		notebook = tests.new_notebook(fakedir='/source/dir/')
 
 		linker = StaticLinker('html', notebook)
 		linker.set_usebase(True) # normally set by html format module
 		linker.set_path(Path('foo:bar')) # normally set by exporter
 		linker.set_base(Dir('/source/dir/foo')) # normally set by exporter
 
-		self.assertEqual(linker.page('+dus'), './bar/dus.html')
-		self.assertEqual(linker.page('dus'), './dus.html')
-		self.assertEqual(linker.file('./dus.pdf'), './bar/dus.pdf')
-		self.assertEqual(linker.file('../dus.pdf'), './dus.pdf')
-		self.assertEqual(linker.file('../../dus.pdf'), '../dus.pdf')
-
-
-class TestExport(TestCase):
-
-	slowTest = True
+		self.assertEqual(linker.link_page('+dus'), './bar/dus.html')
+		self.assertEqual(linker.link_page('dus'), './dus.html')
+		self.assertEqual(linker.link_file('./dus.pdf'), './bar/dus.pdf')
+		self.assertEqual(linker.link_file('../dus.pdf'), './dus.pdf')
+		self.assertEqual(linker.link_file('../../dus.pdf'), '../dus.pdf')
+
+
[e-mail]
+class TestExport(tests.TestCase):
 
 	options = {'format': 'html', 'template': 'Default'}
 
 	def setUp(self):
-		self.dir = Dir(create_tmp_dir('export_ExportedFiles'))
+		self.dir = Dir(self.create_tmp_dir('exported_files'))
 
 	def export(self):
-		notebook = get_test_notebook()
-		notebook.get_store(Path(':')).dir = Dir('/foo/bar') # fake source dir
-		notebook.index.update()
+		notebook = tests.new_notebook(fakedir='/foo/bar')
+
 		exporter = Exporter(notebook, **self.options)
 		exporter.export_all(self.dir)
 
@@ -75,10 +73,10 @@
 class TestExportCommandLine(TestExportFullOptions):
 
 	def export(self):
-		dir = Dir(create_tmp_dir('export_SourceFiles'))
+		dir = Dir(self.create_tmp_dir('source_files'))
 		init_notebook(dir)
 		notebook = Notebook(dir=dir)
-		for name, text in get_test_data('wiki'):
+		for name, text in tests.WikiTestData:
 			page = notebook.get_page(Path(name))
 			page.parse('wiki', text)
 			notebook.store_page(page)
@@ -94,21 +92,18 @@
 # TODO test export single page from command line
 
 
-class TestExportDialog(TestCase):
-
-	slowTest = True
[e-mail]
+class TestExportDialog(tests.TestCase):
 
 	def runTest(self):
 		'''Test ExportDialog'''
 		from zim.gui.exportdialog import ExportDialog
 
-		dir = Dir(create_tmp_dir('export_ExportDialog'))
-
-		notebook = get_test_notebook()
-		notebook.get_store(Path(':')).dir = Dir('/foo/bar') # fake source dir
-		notebook.index.update()
-
-		ui = MockObject()
+		dir = Dir(self.create_tmp_dir())
+
+		notebook = tests.new_notebook(fakedir='/foo/bar')
+
+		ui = tests.MockObject()
 		ui.notebook = notebook
 		ui.page = Path('foo')
 		ui.mainwindow = None

=== modified file 'tests/formats.py'
--- tests/formats.py	2011-02-19 16:27:44 +0000
+++ tests/formats.py	2011-06-04 21:27:03 +0000
@@ -6,18 +6,20 @@
 
 from __future__ import with_statement
 
-from tests import TestCase, get_test_data_page, get_test_page, LoggingFilter
+
+import tests
 
 from zim.formats import *
-from zim.notebook import Link
+from zim.notebook import Path, Link
 from zim.parsing import link_type
 
 if not ElementTreeModule.__name__.endswith('cElementTree'):
 	print 'WARNING: using ElementTree instead of cElementTree'
 
-wikitext = get_test_data_page('wiki', 'roundtrip')
-
-class TestParseTree(TestCase):
+wikitext = tests.WikiTestData.get('roundtrip')
+
+
+class TestParseTree(tests.TestCase):
 
 	def setUp(self):
 		self.xml = '''\
@@ -41,7 +43,7 @@
 		e = tree.getroot()
 		self.assertEqual(e.tag, 'zim-tree') # check content
 		text = tree.tostring()
-		self.assertEqualDiff(text, self.xml)
+		self.assertEqual(text, self.xml)
 
 	def testcleanup_headings(self):
 		'''Test ParseTree.cleanup_headings()'''
@@ -60,7 +62,7 @@
 </zim-tree>'''
 		tree.cleanup_headings(offset=1, max=4)
 		text = tree.tostring()
-		self.assertEqualDiff(text, wanted)
+		self.assertEqual(text, wanted)
 
 	def testSetHeading(self):
 		'''Test ParseTree.set_heading()'''
@@ -79,7 +81,7 @@
 <h level="6">Head 8</h>
 </zim-tree>'''
 		text = tree.tostring()
-		self.assertEqualDiff(text, wanted)
+		self.assertEqual(text, wanted)
 
 	def testExtend(self):
 		tree1 = ParseTree().fromstring(self.xml)
@@ -107,13 +109,30 @@
 <h level="6">Head 8</h>
 </zim-tree>'''
 		text = tree.tostring()
-		self.assertEqualDiff(text, wanted)
-
-class TestTextFormat(TestCase):
+		self.assertEqual(text, wanted)
+
+
+	def testGetEndsWithNewline(self):
+		for xml, newline in (
+			('<zim-tree partial="True">foo</zim-tree>', False),
+			('<zim-tree partial="True"><strong>foo</strong></zim-tree>', False),
+			('<zim-tree partial="True"><strong>foo</strong>\n</zim-tree>', True),
+			('<zim-tree partial="True"><strong>foo\n</strong></zim-tree>', True),
+			('<zim-tree partial="True"><strong>foo</strong>\n<img src="foo"></img></zim-tree>', False),
+			('<zim-tree partial="True"><li bullet="unchecked-box" indent="0">foo</li></zim-tree>', True),
+			('<zim-tree partial="True"><li bullet="unchecked-box" indent="0"><strong>foo</strong></li></zim-tree>', True),
+			('<zim-tree partial="True"><li bullet="unchecked-box" indent="0"><strong>foo</strong></li></zim-tree>', True),
+		):
+			tree = ParseTree().fromstring(xml)
+			self.assertEqual(tree.get_ends_with_newline(), newline)
+
+
+class TestTextFormat(tests.TestCase):
 
 	def setUp(self):
 		self.format = get_format('plain')
-		notebook, self.page = get_test_page()
+		notebook = tests.new_notebook()
+		self.page = notebook.get_page(Path('Foo'))
 
 	def testRoundtrip(self):
 		'''Test roundtrip for plain text'''
@@ -123,8 +142,8 @@
 		#~ print '>>>\n'+tree.tostring()+'\n<<<\n'
 		xml = tree.tostring()
 		output = self.format.Dumper().dump(tree)
-		self.assertEqualDiff(tree.tostring(), xml) # check tree not modified
-		self.assertEqualDiff(output, wikitext.splitlines(True))
+		self.assertEqual(tree.tostring(), xml) # check tree not modified
+		self.assertEqual(output, wikitext.splitlines(True))
 
 	def testDumping(self):
 		'''Test dumping page to plain text'''
@@ -153,6 +172,7 @@
 IMAGE: Foo Bar
 LINKS: :foo:bar ./file.png file:///etc/passwd
 LINKS: FooBar
+TAGS: @foo @bar
 
 	Some indented
 	paragraphs go here ...
@@ -193,7 +213,7 @@
 
 That's all ...
 '''
-		self.assertEqualDiff(text, wanted.splitlines(True))
+		self.assertEqual(text, wanted.splitlines(True))
 
 
 class TestWikiFormat(TestTextFormat):
@@ -201,7 +221,9 @@
 	def setUp(self):
 		#~ TestTextFormat.setUp(self)
 		self.format = get_format('wiki')
-		notebook, self.page = get_test_page()
+		notebook = tests.new_notebook()
+		self.page = notebook.get_page(Path('Foo'))
+
 
 	def testRoundtrip(self):
 		'''Test roundtrip for wiki text'''
@@ -224,7 +246,7 @@
 		#~ print '>>>\n'+tostring(tree)+'\n<<<\n'
 		#~ self.assertEquals(tree.getroot().attrib['Content-Type'], 'text/x-zim-wiki')
 		#~ output = self.format.Dumper().dump(tree)
-		#~ self.assertEqualDiff(output, text.splitlines(True))
+		#~ self.assertEqual(output, text.splitlines(True))
 
 	def testParsing(self):
 		'''Test wiki parse tree generation.'''
@@ -252,6 +274,7 @@
 <p>IMAGE: <img src="../my-image.png" width="600">Foo Bar</img>
 LINKS: <link href=":foo:bar">:foo:bar</link> <link href="./file.png">./file.png</link> <link href="file:///etc/passwd">file:///etc/passwd</link>
 LINKS: <link href="Foo">Foo</link><link href="Bar">Bar</link>
+TAGS: <tag name="foo">@foo</tag> <tag name="bar">@bar</tag>
 </p>
 <p><div indent="1">Some indented
 paragraphs go here ...
@@ -279,7 +302,7 @@
 <p>That's all ...
 </p></zim-tree>'''
 		t = self.format.Parser().parse(wikitext)
-		self.assertEqualDiff(t.tostring(), tree)
+		self.assertEqual(t.tostring(), tree)
 
 	def testUnicodeBullet(self):
 		'''Test support for unicode bullets in source'''
@@ -297,7 +320,7 @@
 '''
 		tree = self.format.Parser().parse(input)
 		output = self.format.Dumper().dump(tree)
-		self.assertEqualDiff(output, text.splitlines(True))
+		self.assertEqual(output, text.splitlines(True))
 
 	def testLink(self):
 		'''Test iterator function for link'''
@@ -340,16 +363,17 @@
 <p>test 4 5 6
 </p></zim-tree>'''
 		t = self.format.Parser(version='Unknown').parse(input)
-		self.assertEqualDiff(t.tostring(), xml)
+		self.assertEqual(t.tostring(), xml)
 		output = self.format.Dumper().dump(t)
-		self.assertEqualDiff(output, wanted.splitlines(True))
-
-
-class TestHtmlFormat(TestCase):
+		self.assertEqual(output, wanted.splitlines(True))
+
+
+class TestHtmlFormat(tests.TestCase):
 
 	def setUp(self):
 		self.format = get_format('html')
-		notebook, self.page = get_test_page()
+		notebook = tests.new_notebook()
+		self.page = notebook.get_page(Path('Foo'))
 
 	def testEncoding(self):
 		'''Test HTML encoding'''
@@ -399,6 +423,7 @@
 IMAGE: <img src="img://../my-image.png" alt="Foo Bar" width="600"><br>
 LINKS: <a href="page://:foo:bar" title=":foo:bar">:foo:bar</a> <a href="file://./file.png" title="./file.png">./file.png</a> <a href="file://file:///etc/passwd" title="file:///etc/passwd">file:///etc/passwd</a><br>
 LINKS: <a href="page://Foo" title="Foo">Foo</a><a href="page://Bar" title="Bar">Bar</a><br>
+TAGS: <span class="zim-tag">@foo</span> <span class="zim-tag">@bar</span><br>
 </p>
 
 <p>
@@ -478,16 +503,16 @@
 That's all ...<br>
 </p>
 '''
-		self.assertEqualDiff(output, html.splitlines(True))
-
-
-class LatexLoggingFilter(LoggingFilter):
+		self.assertEqual(output, html.splitlines(True))
+
+
+class LatexLoggingFilter(tests.LoggingFilter):
 
 	logger = 'zim.formats.latex'
 	message = 'No document type set in template'
 
 
-class TestLatexFormat(TestCase):
+class TestLatexFormat(tests.TestCase):
 
 	def testEncode(self):
 		'''test the escaping of certain characters'''
@@ -501,7 +526,7 @@
 		'''test the export of a wiki page to latex'''
 		with LatexLoggingFilter():
 			format = get_format('LaTeX')
-			testpage = get_test_data_page('wiki','Test:wiki')
+			testpage = tests.WikiTestData.get('Test:wiki')
 			tree = get_format('wiki').Parser().parse(testpage)
 			output = format.Dumper(linker=StubLinker()).dump(tree)
 			self.assertTrue('\chapter{Foo Bar}\n' in output)
@@ -520,7 +545,7 @@
 	def icon(self, name): return 'icon://' + name
 
 
-class TestParseTreeBuilder(TestCase):
+class TestParseTreeBuilder(tests.TestCase):
 
 	def runTest(self):
 		'''Test ParseTreeBuilder class'''
@@ -579,5 +604,4 @@
 		builder.feed(input)
 		root = builder.close()
 		tree = ParseTree(root)
-		self.assertEqualDiff(tree.tostring(), wanted)
-
+		self.assertEqual(tree.tostring(), wanted)

=== modified file 'tests/fs.py'
--- tests/fs.py	2011-02-19 16:27:44 +0000
+++ tests/fs.py	2011-06-04 21:27:03 +0000
@@ -11,6 +11,7 @@
 import os
 import time
 
+import zim.fs
 from zim.fs import *
 from zim.fs import Path, FileHandle, FileWriteError, TmpFile, get_tmpdir, normalize_win32_share, PathLookupError, FileNotFoundError, FilteredDir, isabs, joinpath
 from zim.errors import Error
@@ -118,7 +119,7 @@
 	def testFileHandle(self):
 		'''Test FileHandle object'''
 		self.on_close_called = False
-		tmpdir = tests.create_tmp_dir('fs_testFile')
+		tmpdir = self.create_tmp_dir('testFileHandle')
 		fh = FileHandle(
 			tmpdir+'/foo.txt', mode='w', on_close=self.on_close)
 		fh.write('duss')
@@ -130,7 +131,7 @@
 
 	def testFile(self):
 		'''Test File object'''
-		tmpdir = tests.create_tmp_dir('fs_testFile')
+		tmpdir = self.create_tmp_dir('testFile')
 		file = File(tmpdir+'/foo/bar/baz.txt')
 		assert not file.exists()
 		file.touch()
@@ -230,7 +231,7 @@
 
 	def testDir(self):
 		'''Test Dir object'''
-		tmpdir = tests.create_tmp_dir('fs_testDir')
+		tmpdir = self.create_tmp_dir('testDir')
 		dir = Dir(tmpdir+'/foo/bar')
 		assert not dir.exists()
 
@@ -261,12 +262,22 @@
 
 		self.assertEqual(File((dir, 'foo.txt')), dir.file('foo.txt'))
 		self.assertEqual(dir.file(File((dir, 'foo.txt'))), dir.file('foo.txt'))
+		self.assertEqual(dir.file(Path((dir, 'foo.txt'))), dir.file('foo.txt'))
+		self.assertEqual(dir.file(('foo.txt',)), dir.file('foo.txt'))
 		self.assertRaises(PathLookupError, dir.file, File('/foo/bar.txt')) # not below dir
 
+		self.assertEqual(dir.resolve_file('../foo.txt'), dir.dir.file('foo.txt'))
+		self.assertEqual(dir.resolve_file(File('/foo/bar.txt')), File('/foo/bar.txt'))
+
 		self.assertEqual(Dir((dir, 'bar')), dir.subdir('bar'))
 		self.assertEqual(dir.subdir(Dir((dir, 'bar'))), dir.subdir('bar'))
+		self.assertEqual(dir.subdir(Path((dir, 'bar'))), dir.subdir('bar'))
+		self.assertEqual(dir.subdir(('bar',)), dir.subdir('bar'))
 		self.assertRaises(PathLookupError, dir.subdir, Dir('/foo/bar')) # not below dir
 
+		self.assertEqual(dir.resolve_dir('../bar'), dir.dir.subdir('bar'))
+		self.assertEqual(dir.resolve_dir(Dir('/foo/bar')), Dir('/foo/bar'))
+
 		self.assertRaises(OSError, dir.remove) # dir not empty
 		self.assertTrue(dir.exists())
 		dir.cleanup()
@@ -279,12 +290,11 @@
 		self.assertEqual(dir.list(), []) # list non-existing dir
 
 
[e-mail]
 class TestFileOverwrite(tests.TestCase):
 
-	slowTest = True
-
 	def setUp(self):
-		self.path = tests.create_tmp_dir('fs_testOverwrite')+'/file.txt'
+		self.path = self.create_tmp_dir()+'/file.txt'
 
 	def modify(self, func):
 		mtime = os.stat(self.path).st_mtime
@@ -329,22 +339,15 @@
 		self.assertEquals(file.read(), 'foo')
 
 
[e-mail]
[e-mail](hasattr(os, 'symlink'), 'OS does not supprot symlinks')
 class TestSymlinks(tests.TestCase):
 
-	slowTest = True
-
-	@staticmethod
-	def skipTest():
-		if not hasattr(os, 'symlink'):
-			return 'OS does not supprot symlinks'
-		else:
-			return False
-
 	def runTest(self):
 		'''Test file operations are safe for symlinks'''
 
 		# Set up a file structue with a symlink
-		tmpdir = tests.create_tmp_dir('fs_TestSymLinks')
+		tmpdir = self.create_tmp_dir()
 		targetdir = Dir(tmpdir + '/target')
 		targetdir.file('foo.txt').touch()
 		targetfile = File(tmpdir + '/target.txt')
@@ -383,3 +386,28 @@
 		self.assertEqual(dir.list(), [])
 		self.assertTrue(targetdir.exists())
 		self.assertEqual(targetdir.list(), ['foo.txt'])
+
+
[e-mail]
[e-mail](zim.fs.gio, 'Trashing not supported, \'gio\' is missing')
+class TestTrash(tests.TestCase):
+
+	def runTest(self):
+		'''Test trashing files and folders'''
+		root = Dir(self.create_tmp_dir())
+		file = root.file('test.txt')
+		file.touch()
+		self.assertTrue(file.exists())
+		self.assertTrue(file.trash())
+		self.assertFalse(file.exists())
+		dir = root.subdir('test')
+		dir.touch()
+		self.assertTrue(dir.exists())
+		self.assertTrue(dir.trash())
+		self.assertFalse(dir.exists())
+
+		# fails silent if file does not exist
+		self.assertFalse(file.trash())
+		self.assertFalse(dir.trash())
+
+		# How can we cause gio to give an error and test that case ??

=== modified file 'tests/gui.py'
--- tests/gui.py	2011-02-14 20:22:50 +0000
+++ tests/gui.py	2011-06-04 21:27:03 +0000
@@ -1,23 +1,31 @@
-
-from tests import TestCase, get_test_notebook, create_tmp_dir, MockObject
+# -*- coding: utf-8 -*-
+
+# Copyright 2009 Jaap Karssenberg <[e-mail]>
+
+from __future__ import with_statement
+
+import tests
+
 
 from zim.errors import Error
-from zim.notebook import Path
+from zim.notebook import get_notebook_list, Path, NotebookInfo
 from zim.fs import File, Dir
+from zim.config import config_file
 
 import zim.gui
 
 from zim.gui.clipboard import *
 
 
-class TestClipboard(TestCase):
[e-mail]
+class TestClipboard(tests.TestCase):
 
 	def runTest(self):
 		'''Test clipboard interaction'''
+		path = self.get_tmp_name()
+		notebook = tests.new_notebook(fakedir=path)
+
 		clipboard = Clipboard()
-		notebook = get_test_notebook()
-		tmp_dir = create_tmp_dir('gui_Clipboard')
-		notebook.get_store(Path(':')).dir = Dir(tmp_dir) # fake source dir
 
 		# tree roundtrip
 		for pagename in ('Test:wiki', 'roundtrip'):
@@ -36,7 +44,7 @@
 
 		wanted = 'some **bold** text\n'
 		text = clipboard.wait_for_text()
-		self.assertEqualDiff(text, wanted)
+		self.assertEqual(text, wanted)
 
 		wanted = '''\
 <html>
@@ -54,7 +62,7 @@
 </html>
 '''
 		selection = clipboard.wait_for_contents('text/html')
-		self.assertEqualDiff(selection.data, wanted)
+		self.assertEqual(selection.data, wanted)
 
 		wanted = '''\
 Version:1.0\r
@@ -72,7 +80,7 @@
 </p>
 <!--EndFragment--></BODY></HTML>'''
 		selection = clipboard.wait_for_contents('HTML Format')
-		self.assertEqualDiff(selection.data, wanted)
+		self.assertEqual(selection.data, wanted)
 
 
 		# pagelink -> ..
@@ -153,12 +161,12 @@
 		self.assertEqual(notebook.resolve_file(rel_path, page), file_obj)
 
 
-class TestDialogs(TestCase):
-
-	slowTest = True
[e-mail]
+class TestDialogs(tests.TestCase):
 
 	def setUp(self):
-		self.ui = MockUI('Test:foo:bar')
+		path = self.create_tmp_dir()
+		self.ui = MockUI('Test:foo:bar', fakedir=path)
 
 	def testOpenPageDialog(self):
 		'''Test OpenPageDialog dialog (Jump To...)'''
@@ -213,7 +221,7 @@
 
 	def testSaveCopyDialog(self):
 		'''Test SaveCopyDialog'''
-		tmp_dir = create_tmp_dir('gui_SaveCopyDialog')
+		tmp_dir = self.create_tmp_dir('testSaveCopyDialog')
 		file = File((tmp_dir, 'save_copy.txt'))
 		self.assertFalse(file.exists())
 		dialog = zim.gui.SaveCopyDialog(self.ui)
@@ -223,11 +231,10 @@
 
 	def testImportPageDialog(self):
 		'''Test ImportPageDialog'''
-		tmp_dir = create_tmp_dir('gui_ImportPageDialog')
+		tmp_dir = self.create_tmp_dir('testImportPageDialog')
 		file = File((tmp_dir, 'import_page.txt'))
 		file.write('test 123\n')
 		self.assertTrue(file.exists())
-		self.ui = MockUI()
 		dialog = zim.gui.ImportPageDialog(self.ui)
 		dialog.set_file(file)
 		#~ dialog.assert_response_ok()
@@ -295,15 +302,13 @@
 
 	def testAttachFileDialog(self):
 		'''Test AttachFileDialog'''
-		tmp_dir = create_tmp_dir('gui_AttachFileDialog')
+		tmp_dir = self.create_tmp_dir('testAttachFileDialog')
 		file = File((tmp_dir, 'file_to_be_attached'))
 		file.write('Test 1 2 3\n')
 		newfile = File((tmp_dir, 'attachments', 'Test', 'foo', 'file_to_be_attached'))
 		self.assertTrue(file.exists())
 		self.assertFalse(newfile.exists())
 
-		store = self.ui.notebook.get_store(Path(':'))
-		store.dir = Dir((tmp_dir, 'attachments')) # Fake dir based notebook
 		dialog = zim.gui.AttachFileDialog(self.ui, path=Path('Test:foo'))
 		dialog.set_file(file)
 		#~ dialog.assert_response_ok()
@@ -311,20 +316,19 @@
 		#~ self.assertTrue(file.exists()) # No move or delete happened
 		#~ self.assertTrue(newfile.exists())
 		#~ self.assertTrue(newfile.compare(file))
-		#~ del store.dir
 
 	def testSearchDialog(self):
 		'''Test SearchDialog'''
 		from zim.gui.searchdialog import SearchDialog
-		self.ui.notebook = get_test_notebook()
+		self.ui.notebook = tests.new_notebook()
 		dialog = SearchDialog(self.ui)
 		dialog.query_entry.set_text('Foo')
 		dialog.query_entry.activate()
 		model = dialog.results_treeview.get_model()
 		self.assertTrue(len(model) > 3)
 
-		self.ui.mainwindow = MockObject()
-		self.ui.mainwindow.pageview = MockObject()
+		self.ui.mainwindow = tests.MockObject()
+		self.ui.mainwindow.pageview = tests.MockObject()
 		col = dialog.results_treeview.get_column(0)
 		dialog.results_treeview.row_activated((0,), col)
 
@@ -380,8 +384,52 @@
 	def testPropertiesDialog(self):
 		'''Test PropertiesDialog'''
 		from zim.gui.propertiesdialog import PropertiesDialog
-		dialog = PropertiesDialog(self.ui)
-		dialog.assert_response_ok()
+		self.ui.readonly = True
+		dialog = PropertiesDialog(self.ui)
+		dialog.assert_response_ok()
+
+		from zim.config import ConfigDictFile
+		notebook = self.ui.notebook
+		file = notebook.dir.file('notebook.zim')
+		notebook.config = ConfigDictFile(file)
+		self.ui.readonly = False
+
+		config1 = {
+			'name': 'Notebook Foo',
+			'home': 'Home',
+			'icon': './icon.png',
+			'document_root': '/foo',
+			'shared': False,
+		}
+		config2 = {
+			'name': 'Notebook Bar',
+			'home': 'HomeSweetHome',
+			'icon': './picture.png',
+			'document_root': '/bar',
+			'shared': True,
+		}
+		notebook.save_properties(**config1)
+		self.assertEqual(notebook.config['Notebook'], config1)
+
+		dialog = PropertiesDialog(self.ui)
+		dialog.assert_response_ok()
+
+		self.assertEqual(notebook.config['Notebook'], config1)
+		self.assertEqual(notebook.name, config1['name'])
+		self.assertEqual(notebook.get_home_page(), Path(config1['home']))
+		self.assertEqual(notebook.icon, notebook.dir.file(config1['icon']).path)
+		self.assertEqual(notebook.document_root, Dir(config1['document_root']))
+
+		dialog = PropertiesDialog(self.ui)
+		dialog.form.update(config2)
+		dialog.assert_response_ok()
+
+		self.assertEqual(notebook.config['Notebook'], config2)
+		self.assertEqual(notebook.name, config2['name'])
+		self.assertEqual(notebook.get_home_page(), Path(config2['home']))
+		self.assertEqual(notebook.icon, notebook.dir.file(config2['icon']).path)
+		self.assertEqual(notebook.document_root, Dir(config2['document_root']))
+
 
 	def testPreferencesDialog(self):
 		'''Test PreferencesDialog'''
@@ -432,14 +480,114 @@
 
 
 	# Test for ExportDialog can be found in test/export.py
-
-
-class MockUI(MockObject):
-
-	tmp_dir = create_tmp_dir('gui_MockUI')
-
-	def __init__(self, page=None):
-		MockObject.__init__(self)
+	# Test for NotebookDialog is in separate class below
+
+
[e-mail]
+class TestGtkInterface(tests.TestCase):
+
+	def runTest(self):
+		ui = zim.gui.GtkInterface()
+
+		# test populating menus
+		menu = gtk.Menu()
+		ui.populate_popup('page_popup', menu)
+		items = menu.get_children()
+		self.assertTrue(len(items) > 3)
+
+
[e-mail]
+class TestNotebookDialog(tests.TestCase):
+
+	def setUp(self):
+		list = config_file('notebooks.list')
+		file = list.file
+		if file.exists():
+			file.remove()
+
+	def runTest(self):
+		from zim.gui.notebookdialog import prompt_notebook, \
+			AddNotebookDialog, NotebookDialog
+
+		tmpdir = self.create_tmp_dir()
+		dir1 = Dir(tmpdir + '/mynotebook1')
+		dir2 = Dir(tmpdir + '/mynotebook2')
+
+		# First time we get directly the AddNotebookDialog
+		def doAddNotebook(dialog):
+			self.assertTrue(isinstance(dialog, AddNotebookDialog))
+			dialog.form['name'] = 'Foo'
+			dialog.form['folder'] = dir1.path
+			dialog.assert_response_ok()
+
+		with tests.DialogContext(doAddNotebook):
+			self.assertEqual(prompt_notebook(), dir1.uri)
+
+		# Second time we get the list
+		def testNotebookDialog(dialog):
+			self.assertTrue(isinstance(dialog, NotebookDialog))
+			selection = dialog.treeview.get_selection()
+			selection.select_path((0,)) # select first and only notebook
+			dialog.assert_response_ok()
+
+		with tests.DialogContext(testNotebookDialog):
+			self.assertEqual(prompt_notebook(), dir1.uri)
+
+		# Third time we add a notebook and set the default
+		def doAddNotebook(dialog):
+			self.assertTrue(isinstance(dialog, AddNotebookDialog))
+			dialog.form['name'] = 'Bar'
+			dialog.form['folder'] = dir2.path
+			dialog.assert_response_ok()
+
+		def testAddNotebook(dialog):
+			self.assertTrue(isinstance(dialog, NotebookDialog))
+
+			with tests.DialogContext(doAddNotebook):
+				dialog.do_add_notebook()
+
+			dialog.combobox.set_active(0)
+
+			selection = dialog.treeview.get_selection()
+			selection.select_path((1,)) # select newly added notebook
+			dialog.assert_response_ok()
+
+		with tests.DialogContext(testAddNotebook):
+			self.assertEqual(prompt_notebook(), dir2.uri)
+
+		# Check the notebook exists and the notebook list looks like it should
+		for dir in (dir1, dir2):
+			self.assertTrue(dir.exists())
+			self.assertTrue(dir.file('notebook.zim').exists())
+
+		list = get_notebook_list()
+		self.assertTrue(len(list) == 2)
+		self.assertEqual(list[0], NotebookInfo(dir1.uri, name='Foo'))
+		self.assertEqual(list[1], NotebookInfo(dir2.uri, name='Bar'))
+		self.assertEqual(list.default, NotebookInfo(dir1.uri, name='Foo'))
+
+		# Now unset the default and again check the notebook list
+		def unsetDefault(dialog):
+			self.assertTrue(isinstance(dialog, NotebookDialog))
+			dialog.combobox.set_active(-1)
+			selection = dialog.treeview.get_selection()
+			selection.select_path((1,)) # select newly added notebook
+			dialog.assert_response_ok()
+
+		with tests.DialogContext(unsetDefault):
+			self.assertEqual(prompt_notebook(), dir2.uri)
+
+		list = get_notebook_list()
+		self.assertTrue(len(list) == 2)
+		self.assertTrue(list.default is None)
+
+
+class MockUI(tests.MockObject):
+
+	def __init__(self, page=None, fakedir=None):
+		tests.MockObject.__init__(self)
+
+		self.tmp_dir = self.create_tmp_dir()
 
 		if page and not isinstance(page, Path):
 			self.page = Path(page)
@@ -447,6 +595,4 @@
 			self.page = page
 
 		self.mainwindow = None
-		self.notebook = get_test_notebook()
-		self.notebook.get_store(Path(':')).dir = Dir(self.tmp_dir) # fake source dir
-
+		self.notebook = tests.new_notebook(fakedir=fakedir)

=== modified file 'tests/history.py'
--- tests/history.py	2011-02-19 16:27:44 +0000
+++ tests/history.py	2011-06-04 21:27:03 +0000
@@ -2,18 +2,20 @@
 
 # Copyright 2008 Jaap Karssenberg <[e-mail]>
 
-from tests import TestCase, get_test_notebook
+import tests
+
 
 import zim.history
 from zim.history import History, HistoryPath
 from zim.notebook import Path
 from zim.config import ConfigDict
 
-class TestHistory(TestCase):
+
+class TestHistory(tests.TestCase):
 
 	def setUp(self):
 		zim.history.MAX_HISTORY = 100
-		self.notebook = get_test_notebook()
+		self.notebook = tests.new_notebook()
 		self.pages = [self.notebook.get_page(Path(name))
 			for name in self.notebook.testdata_manifest]
 

=== modified file 'tests/index.py'
--- tests/index.py	2011-02-19 16:27:44 +0000
+++ tests/index.py	2011-06-04 21:27:03 +0000
@@ -8,31 +8,13 @@
 import pango
 
 from zim.fs import Dir
-from zim.notebook import Notebook, Path, Link, init_notebook
+from zim.notebook import Notebook, Path, Link
 from zim.index import *
 from zim.gui.pageindex import *
 from zim.formats import ParseTree
 
-# TODO test n_list_* functions
-
-
-def get_files_notebook(key):
-	# We fill the notebook using the store interface, as this test comes before
-	# the notebook test, but after the store test.
-	dir = Dir(tests.create_tmp_dir('index_'+key))
-	init_notebook(dir)
-	notebook = Notebook(dir=dir)
-	store = notebook.get_store(':')
-	manifest = []
-	for name, text in tests.get_test_data('wiki'):
-		manifest.append(name)
-		page = store.get_page(Path(name))
-		page.parse('wiki', text)
-		store.store_page(page)
-	notebook.testdata_manifest = tests.expand_manifest(manifest)
-	return notebook
-
-
+
[e-mail]
 class TestIndex(tests.TestCase):
 
 	def setUp(self):
@@ -40,7 +22,7 @@
 		# for the notebook. So any assumption from the notebook about
 		# the index will be wrong.
 		self.index = Index(dbfile=':memory:')
-		self.notebook = tests.get_test_notebook()
+		self.notebook = tests.new_notebook()
 		self.index.set_notebook(self.notebook)
 
 	def runTest(self):
@@ -96,6 +78,19 @@
 		n = self.index.n_list_links(Path('Test:foo:bar'), LINK_DIR_BACKWARD)
 		self.assertEqual(n, len(backlist))
 
+		# tags
+		taglist = list(self.index.list_tags(Path('Test:tags')))
+		self.assertTrue(len(taglist) == 11)
+		for tag in taglist:
+			self.assertTrue(isinstance(tag, IndexTag))
+		tagnames = [t.name for t in taglist]
+		aretags = ['tags', 'beginning', 'end', 'tabs', 'verbatim',
+				   'enumerations', 'encoding', 's', 'num6ers', 'wit', 'cr']
+		nottags = ['places', 'links', 'captions', 'Headings', 'word']
+		for t in aretags:
+			self.assertTrue(t in tagnames)
+		for t in nottags:
+			self.assertTrue(not t in tagnames)
 
 		# cursor.row_count is not reliable - see docs
 		def count_pages(db):
@@ -121,7 +116,7 @@
 		self.assertTrue(count_pages(self.index.db) >= manifest)
 		origdb = dump_db(self.index.db)
 		self.index.update(checkcontents=False)
-		self.assertEqualDiff(dump_db(self.index.db), origdb)
+		self.assertEqual(dump_db(self.index.db), origdb)
 
 		# indexkey
 		for path in (Path('Test'), Path('Test:foo')):
@@ -154,7 +149,7 @@
 		self.index.flush()
 		self.assertEqual(count_pages(self.index.db), 1)
 		self.index.update()
-		self.assertEqualDiff(dump_db(self.index.db), origdb)
+		self.assertEqual(dump_db(self.index.db), origdb)
 
 		# now index only part of the tree - and repeat
 		self.index.flush()
@@ -163,7 +158,7 @@
 		self.assertTrue(count_pages(self.index.db) > 2)
 		partdb = dump_db(self.index.db)
 		self.index.update(Path('Test'))
-		self.assertEqualDiff(dump_db(self.index.db), partdb)
+		self.assertEqual(dump_db(self.index.db), partdb)
 
 		# Index whole tree again
 		self.index.update()
@@ -184,6 +179,13 @@
 			path = self.index.lookup_path(Path('foo:bar'))
 			self.assertTrue(path)
 
+		# Check for tag indexing
+		tags = [tag.name for tag in self.index.list_tags(Path('roundtrip'))]
+		for t in ('foo', 'bar'):
+			self.assertTrue(t in tags)
+			tagged = list(self.index.list_tagged_pages(t))
+			self.assertTrue(Path('roundtrip') in tagged)
+
 		tree = ParseTree().fromstring('<zim-tree><link href=":foo:bar">:foo:bar</link></zim-tree>')
 		page = self.notebook.get_page(Path('roundtrip'))
 		page.set_parsetree(tree)
@@ -198,13 +200,13 @@
 		self.assertTrue(path is None)
 
 
[e-mail]
 class TestIndexFiles(TestIndex):
 	# Like the test above, but now using a files backend
 
-	slowTest = True
-
 	def setUp(self):
-		self.notebook = get_files_notebook('TestIndexFiles')
+		path = self.create_tmp_dir()
+		self.notebook = tests.new_files_notebook(path)
 		self.index = self.notebook.index
 
 	def runTest(self):
@@ -221,7 +223,7 @@
 
 	def setUp(self):
 		self.index = Index(dbfile=':memory:')
-		self.notebook = tests.get_test_notebook()
+		self.notebook = tests.new_notebook()
 		self.index.set_notebook(self.notebook)
 		self.notebook.index.update()
 
@@ -233,22 +235,21 @@
 		# Hooking up the treeview as well just to see if we get any errors
 		# From the order the signals are generated.
 
-		ui = StubUI()
+		ui = MockUI()
+		ui.notebook = self.notebook
+		ui.page = Path('Test:foo')
+		self.assertTrue(self.notebook.get_page(ui.page).exists())
+
 		treeview = PageTreeView(ui)
 		treestore = PageTreeStore(self.index)
 		self.assertEqual(treestore.get_flags(), 0)
 		self.assertEqual(treestore.get_n_columns(), 5)
 		treeview.set_model(treestore)
 
-		def process_events(*a):
-			while gtk.events_pending():
-				gtk.main_iteration(block=False)
-			return True # continue
-
-		self.index.update(callback=process_events)
-		process_events()
-
-		treeview = PageTreeView(None) # just run hidden to check errors
+		self.index.update(callback=tests.gtk_process_events)
+		tests.gtk_process_events()
+
+		treeview = PageTreeView(ui) # just run hidden to check errors
 		treeview.set_model(treestore)
 
 		n = treestore.on_iter_n_children(None)
@@ -279,10 +280,11 @@
 
 		# Now walk through the whole notebook testing the API
 		# with nested pages and stuff
-		n = 0
+		npages = 0
 		path = []
 		for page in self.notebook.walk():
-			n += 1
+			#~ print '>>', page
+			npages += 1
 			names = page.name.split(':')
 			if len(names) > len(path):
 				path.append(0) # always increment by one
@@ -340,22 +342,41 @@
 				child = treestore.iter_nth_child(iter, 0)
 				self.assertTrue(child is None)
 
-		self.assertTrue(n > 0) # double check sanity of walk() method
+		self.assertTrue(npages > 10) # double check sanity of walk() method
 
 		# Check if all the signals go OK
-		treestore.disconnect()
+		treestore.disconnect_index()
 		del treestore
 		self.index.flush()
 		treestore = PageTreeStore(self.index)
-		self.index.update(callback=process_events)
-
-
+		treeview = PageTreeView(ui, treestore)
+		self.index.update(callback=tests.gtk_process_events)
+
+		# Try some TreeView methods
+		path = Path('Test:foo')
+		self.assertTrue(treeview.select_page(path))
+		self.assertEqual(treeview.get_selected_path(), path)
+		treepath = treeview.get_model().get_treepath(path)
+		self.assertTrue(not treepath is None)
+		col = treeview.get_column(0)
+		treeview.row_activated(treepath, col)
+
+		#~ treeview.emit('popup-menu')
+		treeview.emit('insert-link', path)
+		treeview.emit('copy')
+
+		# Check if all the signals go OK in delete
+		for page in reversed(list(self.notebook.walk())): # delete bottom up
+			self.notebook.delete_page(page)
+			tests.gtk_process_events()
+
+
[e-mail]
 class TestPageTreeStoreFiles(TestPageTreeStore):
 
-	slowTest = True
-
 	def setUp(self):
-		self.notebook = get_files_notebook('TestPageTreeStoreFiles')
+		path = self.create_tmp_dir()
+		self.notebook = tests.new_files_notebook(path)
 		self.index = self.notebook.index
 
 	def runTest(self):
@@ -363,13 +384,7 @@
 		TestPageTreeStore.runTest(self)
 
 
-class StubUI(object):
+class MockUI(tests.MockObject):
 
 	page = None
 	notebook = None
-
-	def connect(*a):
-		pass
-
-	def connect_after(*a):
-		pass

=== modified file 'tests/inlinecalculator.py'
--- tests/inlinecalculator.py	2011-02-19 16:27:44 +0000
+++ tests/inlinecalculator.py	2011-06-04 21:27:03 +0000
@@ -1,18 +1,15 @@
-
 # -*- coding: utf-8 -*-
 
 # Copyright 2008 Jaap Karssenberg <[e-mail]>
 
 import tests
-from tests import TestCase
 
 import zim.plugins
 from zim.config import ConfigDict
 
 
-class TestPrintToBrowser(TestCase):
-
-	slowTest = True
[e-mail]
+class TestPrintToBrowser(tests.TestCase):
 
 	def runTest(self):
 		'Test InlineCalculator plugin'
@@ -90,7 +87,7 @@
 	ui_type = 'stub'
 
 	def __init__(self):
-		self.notebook = tests.get_test_notebook()
+		self.notebook = tests.new_notebook()
 		self.preferences = ConfigDict()
 		self.uistate = ConfigDict()
 

=== modified file 'tests/notebook.py'
--- tests/notebook.py	2011-02-19 16:27:44 +0000
+++ tests/notebook.py	2011-06-04 21:27:03 +0000
@@ -13,11 +13,13 @@
 import zim.errors
 from zim.formats import ParseTree
 
-
+from zim import _get_default_or_only_notebook
+	# private, but want to check it anyway
+
+
[e-mail]
 class TestGetNotebook(tests.TestCase):
 
-	slowTest = True
-
 	def setUp(self):
 		list = config_file('notebooks.list')
 		file = list.file
@@ -25,16 +27,16 @@
 			file.remove()
 
 	def runTest(self):
-		root = Dir(tests.create_tmp_dir(u'notebook_TestGetNotebook_\u0421\u0430\u0439'))
+		root = Dir(self.create_tmp_dir(u'some_utf8_here_\u0421\u0430\u0439'))
 
 		# Start empty - see this is no issue
 		list = get_notebook_list()
-		self.assertTrue(isinstance(list, NotebookList))
-		self.assertFalse(list)
+		self.assertTrue(isinstance(list, NotebookInfoList))
+		self.assertTrue(len(list) == 0)
 
 		nb, page = resolve_notebook('foo')
 		self.assertTrue(nb is None)
-		nb = resolve_default_notebook()
+		nb = _get_default_or_only_notebook()
 		self.assertTrue(nb is None)
 
 		# Non-existing dir
@@ -56,36 +58,45 @@
 		self.assertEqual(page, Path('foo:bar:baz'))
 
 		# And put it in the list and resolve it by name
-		list.append(dir.uri)
+		list = get_notebook_list()
+		list.append(NotebookInfo(dir.uri, name='foo'))
 		list.write()
-		list = get_notebook_list()
 		self.assertTrue(len(list) == 1)
+		self.assertTrue(isinstance(list[0], NotebookInfo))
+
+		info = list.get_by_name('foo')
+		self.assertEqual(info.uri, dir.uri)
+		self.assertEqual(info.name, 'foo')
+
 		nb, page = resolve_notebook('foo')
 		self.assertEqual(nb, dir)
 
 		# Single notebook is automatically the default
-		nb = resolve_default_notebook()
-		self.assertEqual(nb, dir)
+		nb = _get_default_or_only_notebook()
+		self.assertEqual(nb, dir.uri)
 
 		# But not anymore after adding second notebook
-		list.append('file:///foo/bar')
+		list = get_notebook_list()
+		list.append(NotebookInfo('file:///foo/bar'))
 		list.write()
-		list = get_notebook_list()
 		self.assertTrue(len(list) == 2)
-		self.assertEqual(list[:], [dir.uri, 'file:///foo/bar'])
+		self.assertEqual(list[:],
+			[NotebookInfo(dir.uri), NotebookInfo('file:///foo/bar')])
 
 		nb, page = resolve_notebook('foo')
 		self.assertEqual(nb, dir)
 		self.assertTrue(isinstance(get_notebook(nb), Notebook))
 
-		nb = resolve_default_notebook()
+		nb = _get_default_or_only_notebook()
 		self.assertTrue(nb is None)
 
-		list.default = 'file:///default/foo'
+		list = get_notebook_list()
+		list.set_default('file:///foo/bar')
 		list.write()
-		list = get_notebook_list()
-		nb = resolve_default_notebook()
-		self.assertEqual(nb, Dir('/default/foo'))
+		nb = _get_default_or_only_notebook()
+		self.assertEqual(nb, Dir('/foo/bar').uri)
+		nb, p = resolve_notebook(nb)
+		self.assertEqual(nb, Dir('/foo/bar'))
 		self.assertEqual(get_notebook(nb), None)
 
 		# Check interwiki parsing
@@ -97,22 +108,20 @@
 
 		# Check backward compatibility
 		file = File('tests/data/notebook-list-old-format.list')
-		wanted = [Dir('~/Notes').uri, Dir('/home/user/code/zim.debug').uri, Dir('/home/user/Foo Bar').uri]
-		list = NotebookList(file)
-		self.assertEqual(list[:], wanted)
-		self.assertEqual(list.default, Dir('/home/user/code/zim.debug').uri)
+		list = NotebookInfoList(file)
+		self.assertEqual(list[:], [
+			NotebookInfo(Dir(path).uri) for path in
+				('~/Notes', '/home/user/code/zim.debug', '/home/user/Foo Bar')
+		])
+		self.assertEqual(list.default,
+			NotebookInfo(Dir('/home/user/code/zim.debug').uri) )
 
 
 class TestNotebook(tests.TestCase):
 
 	def setUp(self):
-		zim.errors.silence_signal_exception_context = True
-		if not hasattr(self, 'notebook'):
-			self.notebook = tests.get_test_notebook()
-			self.notebook.index.update()
-
-	def tearDown(self):
-		zim.errors.silence_signal_exception_context = False
+		path = self.get_tmp_name()
+		self.notebook = tests.new_notebook(fakedir=path)
 
 	def testAPI(self):
 		'''Test various notebook methods'''
@@ -246,6 +255,13 @@
 			':AnotherNewPage:Foo:bar\n'
 			'**bold** :AnotherNewPage\n' )
 
+
+		# Try trashing
+		try:
+			self.notebook.trash_page(Path('TrashMe'))
+		except TrashNotSupportedError:
+			print 'trashing not supported'
+
 		#~ print '\n==== DB ===='
 		#~ self.notebook.index.ensure_update()
 		#~ cursor = self.notebook.index.db.cursor()
@@ -324,15 +340,15 @@
 [[Dus:Ja|Grrr]] # relative link that needs updating on move, but not on rename - with name
 [[:Foo:Bar:Dus]] # Link that could be made relative, but isn't
 '''
-		notebook, page = tests.get_test_page('Foo:Bar:Baz')
+		page = self.notebook.get_page(Path('Foo:Bar:Baz'))
 		page.parse('wiki', text)
-		notebook._update_links_from(page, Path('Dus:Baz'), page,  Path('Dus:Baz'))
-		self.assertEqualDiff(u''.join(page.dump('wiki')), wanted1)
+		self.notebook._update_links_from(page, Path('Dus:Baz'), page,  Path('Dus:Baz'))
+		self.assertEqual(u''.join(page.dump('wiki')), wanted1)
 
-		notebook, page = tests.get_test_page('Dus:Bar')
+		page = self.notebook.get_page(Path('Dus:Bar'))
 		page.parse('wiki', text)
-		notebook._update_links_from(page, Path('Dus:Baz'), page, Path('Dus:Baz'))
-		self.assertEqualDiff(u''.join(page.dump('wiki')), wanted2)
+		self.notebook._update_links_from(page, Path('Dus:Baz'), page, Path('Dus:Baz'))
+		self.assertEqual(u''.join(page.dump('wiki')), wanted2)
 
 		# updating links to the page that was moved
 		# moving from Dus:Baz to Foo:Bar:Baz or renaming to Dus:Bar - updating links in Dus:Ja
@@ -366,15 +382,15 @@
 [[Bar:Hmm]] # absolute link that needs updating
 [[Bar:Hmm:Ja]] # absolute link that needs updating
 '''
-		notebook, page = tests.get_test_page('Dus:Ja')
+		page = self.notebook.get_page(Path('Dus:Ja'))
 		page.parse('wiki', text)
-		notebook._update_links_in_page(page, Path('Dus:Baz'), Path('Foo:Bar:Baz'))
-		self.assertEqualDiff(u''.join(page.dump('wiki')), wanted1)
+		self.notebook._update_links_in_page(page, Path('Dus:Baz'), Path('Foo:Bar:Baz'))
+		self.assertEqual(u''.join(page.dump('wiki')), wanted1)
 
-		notebook, page = tests.get_test_page('Dus:Ja')
+		page = self.notebook.get_page(Path('Dus:Ja'))
 		page.parse('wiki', text)
-		notebook._update_links_in_page(page, Path('Dus:Baz'), Path('Dus:Bar'))
-		self.assertEqualDiff(u''.join(page.dump('wiki')), wanted2)
+		self.notebook._update_links_in_page(page, Path('Dus:Baz'), Path('Dus:Bar'))
+		self.assertEqual(u''.join(page.dump('wiki')), wanted2)
 
 		# now test actual move on full notebook
 		def links(source, href):
@@ -438,12 +454,12 @@
 
 	def testResolveFile(self):
 		'''Test notebook.resolve_file()'''
-		dir = Dir(tests.create_tmp_dir('notebook_testResolveFile'))
 		path = Path('Foo:Bar')
-		self.notebook.dir = dir
-		self.notebook.get_store(path).dir = dir
+		dir = self.notebook.dir
 		self.notebook.config['Notebook']['document_root'] = './notebook_document_root'
-		doc_root = self.notebook.get_document_root()
+		self.notebook.do_properties_changed() # parse config
+		doc_root = self.notebook.document_root
+		self.assertEqual(doc_root, dir.subdir('notebook_document_root'))
 		for link, wanted, cleaned in (
 			('~/test.txt', File('~/test.txt'), '~/test.txt'),
 			(r'~\test.txt', File('~/test.txt'), '~/test.txt'),
@@ -451,6 +467,7 @@
 			('file:/test.txt', File('file:///test.txt'), None),
 			('file://localhost/test.txt', File('file:///test.txt'), None),
 			('/test.txt', doc_root.file('test.txt'), '/test.txt'),
+			('../../notebook_document_root/test.txt', doc_root.file('test.txt'), '/test.txt'),
 			('./test.txt', dir.file('Foo/Bar/test.txt'), './test.txt'),
 			(r'.\test.txt', dir.file('Foo/Bar/test.txt'), './test.txt'),
 			('../test.txt', dir.file('Foo/test.txt'), '../test.txt'),
@@ -468,6 +485,10 @@
 		# check relative path without Path
 		self.assertEqual(
 			self.notebook.relative_filepath(doc_root.file('foo.txt')), '/foo.txt')
+		self.assertEqual(
+			self.notebook.relative_filepath(dir.file('foo.txt')), './foo.txt')
+
+
 
 #	def testResolveLink(self):
 #		'''Test page.resolve_link()'''
@@ -542,7 +563,7 @@
 	'''Test page object'''
 
 	def setUp(self):
-		self.notebook = tests.get_test_notebook()
+		self.notebook = tests.new_notebook()
 
 	def generator(self, name):
 		return self.notebook.get_page(Path(name))
@@ -555,6 +576,7 @@
 <zim-tree>
 <link href='foo:bar'>foo:bar</link>
 <link href='bar'>bar</link>
+<tag name='baz'>@baz</tag>
 </zim-tree>
 '''		)
 		page = Page(Path('Foo'))
@@ -567,6 +589,11 @@
 			('page', 'bar', {}),
 		] )
 
+		tags = list(page.get_tags())
+		self.assertEqual(tags, [
+			('@baz', {'name': 'baz'}),
+		])
+
 		self.assertEqual(page.get_parsetree().tostring(), tree.tostring())
 			# ensure we didn't change the tree
 
@@ -581,7 +608,7 @@
 class TestIndexPage(tests.TestCase):
 
 	def setUp(self):
-		self.notebook = tests.get_test_notebook()
+		self.notebook = tests.new_notebook()
 		self.notebook.index.update()
 
 	def runTest(self):

=== renamed file 'tests/coding.py' => 'tests/package.py'
--- tests/coding.py	2011-02-14 20:22:50 +0000
+++ tests/package.py	2011-06-04 21:27:03 +0000
@@ -1,16 +1,44 @@
-
-from tests import TestCase
+# -*- coding: utf-8 -*-
+
+# Copyright 2011 Jaap Karssenberg <[e-mail]>
+
+# This module contains a number of meta test to check coding style
+# and packaging
+
+import tests
 
 import os
 import copy
-
-
-class TestCoding(TestCase):
+import re
+
+
+class TestCompileAll(tests.TestCase):
+
+	def runTest(self):
+		'''Test if all modules compile'''
+		for file in tests.zim_pyfiles():
+			module = file[:-3].replace('/', '.')
+			assert __import__(module)
+
+
[e-mail]
+class TestNotebookUpgrade(tests.TestCase):
+
+	def runTest(self):
+		'''Test if included notebooks are up to date'''
+		from zim.fs import Dir
+		from zim.notebook import get_notebook
+		for path in ('data/manual', 'HACKING'):
+			notebook = get_notebook(Dir(path))
+			self.assertTrue(not notebook.needs_upgrade)
+
+
+class TestCoding(tests.TestCase):
 	'''This test case enforces some coding style items'''
 
 	def __init__(self, *a):
 		self._code_files = []
-		TestCase.__init__(self, *a)
+		tests.TestCase.__init__(self, *a)
 
 	def list_code(self):
 		'''Return all python files as text'''
@@ -23,16 +51,32 @@
 		self._code_files = []
 		for root in ('zim', 'tests'):
 			for dir, dirs, files in os.walk(root):
-				if 'coding.py' in files:
-					files.remove('coding.py') # Skip this file itself
 				for basename in files:
 					if basename.endswith('.py'):
 						file = dir + '/' + basename
-						#print 'READING', file
+						if file == 'tests/package.py': # skip ourselve
+								continue
+						#~ print 'READING', file
 						fh = open(file)
 						self._code_files.append((file, fh.read()))
 						fh.close()
 
+	def testWrongDependencies(self):
+		'''Check clean dependencies'''
+		#~ for klass in ('gobject', 'gtk', 'gio'): # TODO get rid of gobject as well
+		for klass in ('gtk', 'gio'):
+			import_re = re.compile(r'^(import|from)\s+%s' % klass, re.M)
+				# only match global imports - allow import in limitted scope
+			for file, code in self.list_code():
+				if file.startswith('zim/gui') \
+				or file.startswith('zim/_lib/') \
+				or file.startswith('zim/plugins/') \
+				or file.startswith('tests/'):
+					continue # skip
+				match = import_re.search(code)
+				if match: print '>>>', match.group(0)
+				self.assertFalse(match, '%s imports %s, this is not allowed' % (file, klass))
+
 	def testWrongMethog(self):
 		'''Check for a couple of constructs to be avoided'''
 		for file, code in self.list_code():
@@ -45,24 +89,24 @@
 		'''Check python 2.5 compatibility'''
 		for file, code in self.list_code():
 			import_seen = False
-			in_comment = False
-			n = 0
+			suspect = False
 			for line in code.splitlines():
-				n += 1
-				line = line.lstrip()
+				line = line.strip()
 				if line.startswith('from __future__ ') \
 				and 'with_statement' in line.split():
 					import_seen = True
-				elif in_comment:
-					if line.endswith("'''"):
-						in_comment = False
-					else:
-						pass
-				elif line.startswith("'''"):
-					if not line.endswith("'''"):
-						in_comment = True
-					else:
-						pass
-				elif line.startswith('with '):
-					self.assertTrue(import_seen, '%s missing with_statement import from __future__ ("with" seen on line %i)' % (file, n))
-
+				elif line.startswith('with') and line.endswith(':'):
+					suspect = True
+
+			#~ if suspect: print file, 'uses "with" statement'
+
+			if suspect and not import_seen:
+				# Need real parsing to avoid false positives
+				import tokenize
+				import StringIO
+
+				for token in tokenize.generate_tokens(StringIO.StringIO(code).readline):
+					if token[0] == tokenize.NAME and token[1] == 'with':
+						lineno = token[2][0]
+						line = token[-1]
+						self.assertTrue(import_seen, '%s missing with_statement import from __future__ ("with" seen on line %i):\n%s' % (file, lineno, line))

=== modified file 'tests/pageview.py'
--- tests/pageview.py	2011-02-19 16:27:44 +0000
+++ tests/pageview.py	2011-06-04 21:27:03 +0000
@@ -4,8 +4,8 @@
 
 from __future__ import with_statement
 
-from tests import TestCase, LoggingFilter, MockObject, \
-	get_test_data_page, get_test_page
+import tests
+
 
 from zim.fs import *
 from zim.formats import wiki, ParseTree
@@ -14,7 +14,7 @@
 from zim.config import ConfigDict
 
 
-class FilterNoSuchImageWarning(LoggingFilter):
+class FilterNoSuchImageWarning(tests.LoggingFilter):
 
 	logger = 'zim.gui.pageview'
 	message = 'No such image:'
@@ -22,8 +22,8 @@
 
 def get_tree(wikitext):
 	tree = wiki.Parser().parse(wikitext)
-	notebook, page = get_test_page()
-	notebook.get_store(page).dir = Dir('/foo') # HACK
+	notebook = tests.new_notebook(fakedir='/foo')
+	page = notebook.get_page(Path('Foo'))
 	tree.resolve_images(notebook, page)
 	return tree
 
@@ -37,11 +37,11 @@
 	return ParseTree(root)
 
 
-class TestTextBuffer(TestCase):
+class TestTextBuffer(tests.TestCase):
 
 	def runTest(self):
 		'''Test serialization and interaction of the page view textbuffer'''
-		wikitext = get_test_data_page('wiki', 'roundtrip')
+		wikitext = tests.WikiTestData.get('roundtrip')
 		tree = get_tree(wikitext)
 		buffer = TextBuffer()
 		with FilterNoSuchImageWarning():
@@ -51,30 +51,30 @@
 		result1 = buffer.get_parsetree()
 		#~ print tree.tostring()
 		#~ print result1.tostring()
-		#~ self.assertEqualDiff(result1.tostring(), tree.tostring())
+		#~ self.assertEqual(result1.tostring(), tree.tostring())
 
 		# Compare cooked tree after dumping back
 		resulttext = u''.join(wiki.Dumper().dump(result1))
-		self.assertEqualDiff(resulttext, wikitext)
+		self.assertEqual(resulttext, wikitext)
 
 		# Compare we are stable when loading raw tree again
 		raw = raw1.tostring()
 		with FilterNoSuchImageWarning():
 			buffer.set_parsetree(raw1)
-		self.assertEqualDiff(raw1.tostring(), raw)
+		self.assertEqual(raw1.tostring(), raw)
 			# If this fails, set_parsetree is modifying the tree
 		raw2 = buffer.get_parsetree(raw=True)
-		self.assertEqualDiff(raw2.tostring(), raw)
+		self.assertEqual(raw2.tostring(), raw)
 			# Actual cooked roundtrip test
 
 		# Compare we are stable when loading cooked tree again
 		cooked = result1.tostring()
 		with FilterNoSuchImageWarning():
 			buffer.set_parsetree(result1)
-		self.assertEqualDiff(result1.tostring(), cooked)
+		self.assertEqual(result1.tostring(), cooked)
 			# If this fails, set_parsetree is modifying the tree
 		result2 = buffer.get_parsetree()
-		self.assertEqualDiff(result2.tostring(), cooked)
+		self.assertEqual(result2.tostring(), cooked)
 			# Actual cooked roundtrip test
 
 		# Test 'raw' really preserves "errors"
@@ -101,7 +101,7 @@
 
 		rawtree = buffer.get_parsetree(raw=True)
 		self.assertFalse(buffer.get_modified())
-		self.assertEqualDiff(rawtree.tostring(), input)
+		self.assertEqual(rawtree.tostring(), input)
 
 		# Test errors are cleaned up correctly
 		wanted = '''\
@@ -124,7 +124,7 @@
 <li bullet="*" indent="0">Foo</li><li bullet="*" indent="0">Bar</li></zim-tree>'''
 		tree = buffer.get_parsetree()
 		self.assertFalse(buffer.get_modified())
-		self.assertEqualDiff(tree.tostring(), wanted)
+		self.assertEqual(tree.tostring(), wanted)
 
 		# Test pasting some simple text
 		buffer.set_parsetree(tree) # reset without errors
@@ -157,7 +157,7 @@
 		buffer.insert_parsetree(iter, pastetree, interactive=True)
 		tree = buffer.get_parsetree()
 		self.assertTrue(buffer.get_modified())
-		self.assertEqualDiff(tree.tostring(), wanted)
+		self.assertEqual(tree.tostring(), wanted)
 
 		# Now paste list halfway and see result is OK
 		# because of the bullets pasting should go to a new line
@@ -192,7 +192,7 @@
 		buffer.insert_parsetree(iter, pastetree, interactive=True)
 		tree = buffer.get_parsetree()
 		self.assertTrue(buffer.get_modified())
-		self.assertEqualDiff(tree.tostring(), wanted)
+		self.assertEqual(tree.tostring(), wanted)
 
 		# Test sanity for editing "errors"
 		input = '''\
@@ -213,7 +213,7 @@
 		#print buffer.get_parsetree(raw=True).tostring()
 		#print buffer.get_parsetree().tostring()
 		tree = buffer.get_parsetree()
-		self.assertEqualDiff(tree.tostring(), wanted)
+		self.assertEqual(tree.tostring(), wanted)
 
 		# Strange bug let to second bullet disappearing in this case
 		input = '''\
@@ -231,7 +231,7 @@
 		#~ print buffer.get_parsetree(raw=True).tostring()
 		#~ print buffer.get_parsetree().tostring()
 		tree = buffer.get_parsetree()
-		self.assertEqualDiff(tree.tostring(), input)
+		self.assertEqual(tree.tostring(), input)
 
 		# Check how robust we are for placeholder utf8 character
 		buffer = TextBuffer()
@@ -240,7 +240,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <zim-tree>foo  bar</zim-tree>'''
 		tree = buffer.get_parsetree()
-		self.assertEqualDiff(tree.tostring(), wanted)
+		self.assertEqual(tree.tostring(), wanted)
 
 		# Test merge lines logic on delete
 		input = '''\
@@ -263,7 +263,7 @@
 		tree = get_tree_from_xml(input)
 		buffer.set_parsetree(tree)
 		tree = buffer.get_parsetree()
-		self.assertEqualDiff(tree.tostring(), input)
+		self.assertEqual(tree.tostring(), input)
 
 		iter = buffer.get_iter_at_line(2) # before h2
 		bound = iter.copy()
@@ -283,7 +283,7 @@
 		#~ print buffer.get_parsetree(raw=True).tostring()
 		#~ print buffer.get_parsetree().tostring()
 		tree = buffer.get_parsetree()
-		self.assertEqualDiff(tree.tostring(), wanted)
+		self.assertEqual(tree.tostring(), wanted)
 
 
 
@@ -303,7 +303,7 @@
 		tree = get_tree_from_xml(input)
 		buffer.set_parsetree(tree)
 		tree = buffer.get_parsetree(raw=True)
-		self.assertEqualDiff(tree.tostring(), input) # just a sanity check
+		self.assertEqual(tree.tostring(), input) # just a sanity check
 
 		wanted = '''\
 <?xml version='1.0' encoding='utf-8'?>
@@ -325,7 +325,7 @@
 		buffer.toggle_checkbox_for_cursor_or_selection(XCHECKED_BOX)
 			# Like <Shift><F12> on first list item line
 		tree = buffer.get_parsetree(raw=True)
-		self.assertEqualDiff(tree.tostring(), wanted)
+		self.assertEqual(tree.tostring(), wanted)
 
 		wanted = '''\
 <?xml version='1.0' encoding='utf-8'?>
@@ -346,7 +346,7 @@
 		buffer.toggle_checkbox_for_cursor_or_selection(CHECKED_BOX, recursive=True)
 			# Like keypress would trigger while selection present
 		tree = buffer.get_parsetree(raw=True)
-		self.assertEqualDiff(tree.tostring(), wanted)
+		self.assertEqual(tree.tostring(), wanted)
 
 
 		# Test deleting checkbox and undo / redo does not mess up indenting etc
@@ -364,24 +364,24 @@
 		end = buffer.get_iter_at_line(7) # Baz (before checkbox !)
 		buffer.delete(start, end)
 		tree = buffer.get_parsetree(raw=True)
-		self.assertEqualDiff(tree.tostring(), wanted)
+		self.assertEqual(tree.tostring(), wanted)
 
 		undomanager.undo()
 		tree = buffer.get_parsetree(raw=True)
-		self.assertEqualDiff(tree.tostring(), previous)
+		self.assertEqual(tree.tostring(), previous)
 
 		undomanager.redo()
 		tree = buffer.get_parsetree(raw=True)
-		self.assertEqualDiff(tree.tostring(), wanted)
-
-
-class TestUndoStackManager(TestCase):
+		self.assertEqual(tree.tostring(), wanted)
+
+
+class TestUndoStackManager(tests.TestCase):
 
 	def runTest(self):
 		'''Test the undo/redo functionality'''
 		buffer = TextBuffer()
 		undomanager = UndoStackManager(buffer)
-		wikitext = get_test_data_page('wiki', 'roundtrip')
+		wikitext = tests.WikiTestData.get('roundtrip')
 		tree = get_tree(wikitext)
 
 		with FilterNoSuchImageWarning():
@@ -419,7 +419,7 @@
 			_ = buffer.get_parsetree() # just check for no warnings
 
 		emptytree = buffer.get_parsetree(raw=True)
-		self.assertEqualDiff(emptytree.tostring(),
+		self.assertEqual(emptytree.tostring(),
 			"<?xml version='1.0' encoding='utf-8'?>\n<zim-tree raw=\"True\" />")
 
 		with FilterNoSuchImageWarning():
@@ -427,13 +427,13 @@
 				_ = buffer.get_parsetree() # just check for no warnings
 
 		buffertree2 = buffer.get_parsetree(raw=True)
-		self.assertEqualDiff(buffertree2.tostring(), buffertree1.tostring())
+		self.assertEqual(buffertree2.tostring(), buffertree1.tostring())
 
 		while undomanager.undo():
 			continue
 
 		emptytree = buffer.get_parsetree(raw=True)
-		self.assertEqualDiff(emptytree.tostring(),
+		self.assertEqual(emptytree.tostring(),
 			"<?xml version='1.0' encoding='utf-8'?>\n<zim-tree raw=\"True\" />")
 
 		buffer.clear()
@@ -450,7 +450,7 @@
 		self.assertTrue(len(undomanager.stack) == 5) # 3 words, 2 spaces
 		for group in undomanager.stack:
 			self.assertTrue(len(group) == 1) # merge was sucessfull
-		self.assertEqualDiff(buffer.get_parsetree().tostring(),
+		self.assertEqual(buffer.get_parsetree().tostring(),
 			"<?xml version='1.0' encoding='utf-8'?>\n<zim-tree>fooo barr baz</zim-tree>")
 
 		for wanted in (
@@ -461,11 +461,11 @@
 			"<?xml version='1.0' encoding='utf-8'?>\n<zim-tree />"
 		):
 			undomanager.undo()
-			self.assertEqualDiff(buffer.get_parsetree().tostring(), wanted)
+			self.assertEqual(buffer.get_parsetree().tostring(), wanted)
 
 		while undomanager.redo():
 			continue
-		self.assertEqualDiff(buffer.get_parsetree().tostring(),
+		self.assertEqual(buffer.get_parsetree().tostring(),
 			"<?xml version='1.0' encoding='utf-8'?>\n<zim-tree>fooo barr baz</zim-tree>")
 
 		# test other actions
@@ -473,29 +473,29 @@
 		buffer.place_cursor(iter)
 		buffer.select_word()
 		buffer.toggle_textstyle('strong', interactive=True)
-		self.assertEqualDiff(buffer.get_parsetree().tostring(),
+		self.assertEqual(buffer.get_parsetree().tostring(),
 			"<?xml version='1.0' encoding='utf-8'?>\n<zim-tree>fooo <strong>barr</strong> baz</zim-tree>")
 
 		undomanager.undo()
-		self.assertEqualDiff(buffer.get_parsetree().tostring(),
+		self.assertEqual(buffer.get_parsetree().tostring(),
 			"<?xml version='1.0' encoding='utf-8'?>\n<zim-tree>fooo barr baz</zim-tree>")
 
 		undomanager.redo()
-		self.assertEqualDiff(buffer.get_parsetree().tostring(),
+		self.assertEqual(buffer.get_parsetree().tostring(),
 			"<?xml version='1.0' encoding='utf-8'?>\n<zim-tree>fooo <strong>barr</strong> baz</zim-tree>")
 
 		start, end = map(buffer.get_iter_at_offset, (5, 10))
 		with buffer.user_action:
 			buffer.delete(start, end)
-		self.assertEqualDiff(buffer.get_parsetree().tostring(),
+		self.assertEqual(buffer.get_parsetree().tostring(),
 			"<?xml version='1.0' encoding='utf-8'?>\n<zim-tree>fooo baz</zim-tree>")
 
 		undomanager.undo()
-		self.assertEqualDiff(buffer.get_parsetree().tostring(),
+		self.assertEqual(buffer.get_parsetree().tostring(),
 			"<?xml version='1.0' encoding='utf-8'?>\n<zim-tree>fooo <strong>barr</strong> baz</zim-tree>")
 
 		undomanager.redo()
-		self.assertEqualDiff(buffer.get_parsetree().tostring(),
+		self.assertEqual(buffer.get_parsetree().tostring(),
 			"<?xml version='1.0' encoding='utf-8'?>\n<zim-tree>fooo baz</zim-tree>")
 
 		# test folding
@@ -504,25 +504,25 @@
 		undomanager.undo()
 		undomanager.undo()
 
-		self.assertEqualDiff(buffer.get_parsetree().tostring(),
+		self.assertEqual(buffer.get_parsetree().tostring(),
 			"<?xml version='1.0' encoding='utf-8'?>\n<zim-tree>fooo barr</zim-tree>")
 
 		with buffer.user_action:
 			buffer.insert_at_cursor(' ')
 
 		undomanager.undo()
-		self.assertEqualDiff(buffer.get_parsetree().tostring(),
+		self.assertEqual(buffer.get_parsetree().tostring(),
 			"<?xml version='1.0' encoding='utf-8'?>\n<zim-tree>fooo barr</zim-tree>")
 
 		undomanager.undo() # here we undo fold of 4 undos above
-		self.assertEqualDiff(buffer.get_parsetree().tostring(),
+		self.assertEqual(buffer.get_parsetree().tostring(),
 			"<?xml version='1.0' encoding='utf-8'?>\n<zim-tree>fooo baz</zim-tree>")
 		undomanager.undo()
-		self.assertEqualDiff(buffer.get_parsetree().tostring(),
+		self.assertEqual(buffer.get_parsetree().tostring(),
 			"<?xml version='1.0' encoding='utf-8'?>\n<zim-tree>fooo <strong>barr</strong> baz</zim-tree>")
 
 
-class TestFind(TestCase):
+class TestFind(tests.TestCase):
 
 	def runTest(self):
 		buffer = TextBuffer()
@@ -623,7 +623,7 @@
 FooBaz Foo Bar
 foo Bar Baz Foo
 '''
-		self.assertEqualDiff(text, wanted)
+		self.assertEqual(text, wanted)
 
 		finder.replace_all('dus*\\1*')
 		bounds = buffer.get_bounds()
@@ -633,11 +633,11 @@
 dus*Baz* dus** Bar
 dus** Bar Baz dus**
 '''
-		self.assertEqualDiff(text, wanted)
+		self.assertEqual(text, wanted)
 		self.assertEqual(buffer.get_insert_iter().get_offset(), 6)
 
 
-class TestLists(TestCase):
+class TestLists(tests.TestCase):
 
 	def runTest(self):
 		'''Test interaction for lists'''
@@ -658,7 +658,7 @@
 		tree = get_tree_from_xml(input)
 		buffer.set_parsetree(tree)
 		tree = buffer.get_parsetree(raw=True)
-		self.assertEqualDiff(tree.tostring(), input) # just a sanity check
+		self.assertEqual(tree.tostring(), input) # just a sanity check
 
 		undomanager = UndoStackManager(buffer)
 
@@ -703,7 +703,7 @@
 Tja
 </zim-tree>'''
 		tree = buffer.get_parsetree(raw=True)
-		self.assertEqualDiff(tree.tostring(), wanted)
+		self.assertEqual(tree.tostring(), wanted)
 
 		iter = buffer.get_iter_at_line(7) # Baz
 		row, list = TextBufferList.new_from_iter(buffer, iter)
@@ -728,7 +728,7 @@
 Tja
 </zim-tree>'''
 		tree = buffer.get_parsetree(raw=True)
-		self.assertEqualDiff(tree.tostring(), wanted)
+		self.assertEqual(tree.tostring(), wanted)
 
 		for line in (2, 5, 6): # Bar, Bar 2 & Bar 3
 			iter = buffer.get_iter_at_line(line)
@@ -737,28 +737,28 @@
 			self.assertTrue(list.unindent(row))
 
 		tree = buffer.get_parsetree(raw=True)
-		self.assertEqualDiff(tree.tostring(), input)
+		self.assertEqual(tree.tostring(), input)
 
 		# Test undo / redo for indenting and lists
 		for i in range(3):
 			self.assertTrue(undomanager.undo())
 		tree = buffer.get_parsetree(raw=True)
-		self.assertEqualDiff(tree.tostring(), wanted)
+		self.assertEqual(tree.tostring(), wanted)
 
 		while undomanager.undo():
 			pass
 		tree = buffer.get_parsetree(raw=True)
-		self.assertEqualDiff(tree.tostring(), input)
+		self.assertEqual(tree.tostring(), input)
 
 		while undomanager.redo():
 			pass
 		tree = buffer.get_parsetree(raw=True)
-		self.assertEqualDiff(tree.tostring(), input)
+		self.assertEqual(tree.tostring(), input)
 
 		for i in range(3):
 			self.assertTrue(undomanager.undo())
 		tree = buffer.get_parsetree(raw=True)
-		self.assertEqualDiff(tree.tostring(), wanted)
+		self.assertEqual(tree.tostring(), wanted)
 
 
 		# Exercize recursive checkbox lists
@@ -777,7 +777,7 @@
 		tree = get_tree_from_xml(input)
 		buffer.set_parsetree(tree)
 		tree = buffer.get_parsetree(raw=True)
-		self.assertEqualDiff(tree.tostring(), input) # just a sanity check
+		self.assertEqual(tree.tostring(), input) # just a sanity check
 
 		undomanager = UndoStackManager(buffer)
 
@@ -798,7 +798,7 @@
 Tja
 </zim-tree>'''
 		tree = buffer.get_parsetree(raw=True)
-		self.assertEqualDiff(tree.tostring(), wanted)
+		self.assertEqual(tree.tostring(), wanted)
 
 		list.set_bullet(row, UNCHECKED_BOX)
 		row = list.get_row_at_line(3) # Bar 1
@@ -818,7 +818,7 @@
 Tja
 </zim-tree>'''
 		tree = buffer.get_parsetree(raw=True)
-		self.assertEqualDiff(tree.tostring(), wanted)
+		self.assertEqual(tree.tostring(), wanted)
 
 		row = list.get_row_at_line(5) # Bar 2
 		list.set_bullet(row, CHECKED_BOX)
@@ -835,7 +835,7 @@
 Tja
 </zim-tree>'''
 		tree = buffer.get_parsetree(raw=True)
-		self.assertEqualDiff(tree.tostring(), wanted)
+		self.assertEqual(tree.tostring(), wanted)
 
 		row = list.get_row_at_line(4) # Bar 1.1
 		list.set_bullet(row, UNCHECKED_BOX)
@@ -852,7 +852,7 @@
 Tja
 </zim-tree>'''
 		tree = buffer.get_parsetree(raw=True)
-		self.assertEqualDiff(tree.tostring(), wanted)
+		self.assertEqual(tree.tostring(), wanted)
 
 		wantedpre1 = wanted
 		row = list.get_row_at_line(4) # Bar 1.1
@@ -870,7 +870,7 @@
 Tja
 </zim-tree>'''
 		tree = buffer.get_parsetree(raw=True)
-		self.assertEqualDiff(tree.tostring(), wanted)
+		self.assertEqual(tree.tostring(), wanted)
 
 		# Test indenting / unindenting the whole list
 		wantedpre = wanted
@@ -889,32 +889,32 @@
 Tja
 </zim-tree>'''
 		tree = buffer.get_parsetree(raw=True)
-		self.assertEqualDiff(tree.tostring(), wanted)
+		self.assertEqual(tree.tostring(), wanted)
 
 		list.unindent(row)
 		tree = buffer.get_parsetree(raw=True)
-		self.assertEqualDiff(tree.tostring(), wantedpre)
+		self.assertEqual(tree.tostring(), wantedpre)
 
 		# Test undo / redo for indenting and lists
 		for xml in (wanted, wantedpre, wantedpre1):
 			self.assertTrue(undomanager.undo())
 			tree = buffer.get_parsetree(raw=True)
-			self.assertEqualDiff(tree.tostring(), xml)
+			self.assertEqual(tree.tostring(), xml)
 
 		for xml in (wantedpre, wanted, wantedpre):
 			self.assertTrue(undomanager.redo())
 			tree = buffer.get_parsetree(raw=True)
-			self.assertEqualDiff(tree.tostring(), xml)
+			self.assertEqual(tree.tostring(), xml)
 
 		while undomanager.undo():
 			pass
 		tree = buffer.get_parsetree(raw=True)
-		self.assertEqualDiff(tree.tostring(), input)
+		self.assertEqual(tree.tostring(), input)
 
 		while undomanager.redo():
 			pass
 		tree = buffer.get_parsetree(raw=True)
-		self.assertEqualDiff(tree.tostring(), wantedpre)
+		self.assertEqual(tree.tostring(), wantedpre)
 
 
 def press(widget, sequence):
@@ -940,7 +940,7 @@
 		widget.emit('key-press-event', event)
 
 
-class TestTextView(TestCase):
+class TestTextView(tests.TestCase):
 
 	def setUp(self):
 		# Initialize default preferences from module
@@ -974,7 +974,7 @@
 <zim-tree raw="True">aaa
 <li bullet="*" indent="0"> foo</li></zim-tree>'''
 		tree = buffer.get_parsetree(raw=True)
-		self.assertEqualDiff(tree.tostring(), wanted)
+		self.assertEqual(tree.tostring(), wanted)
 
 		press(view, '\n')
 		wanted = '''\
@@ -984,7 +984,7 @@
 <li bullet="*" indent="0"> </li></zim-tree>'''
 		tree = buffer.get_parsetree(raw=True)
 		start, end = buffer.get_bounds()
-		self.assertEqualDiff(tree.tostring(), wanted)
+		self.assertEqual(tree.tostring(), wanted)
 
 		press(view, '\tduss')
 		wanted = '''\
@@ -993,7 +993,7 @@
 <li bullet="*" indent="0"> foo</li>
 <li bullet="*" indent="1"> duss</li></zim-tree>'''
 		tree = buffer.get_parsetree(raw=True)
-		self.assertEqualDiff(tree.tostring(), wanted)
+		self.assertEqual(tree.tostring(), wanted)
 
 		press(view, '\n')
 		wanted = '''\
@@ -1003,7 +1003,7 @@
 <li bullet="*" indent="1"> duss</li>
 <li bullet="*" indent="1"> </li></zim-tree>'''
 		tree = buffer.get_parsetree(raw=True)
-		self.assertEqualDiff(tree.tostring(), wanted)
+		self.assertEqual(tree.tostring(), wanted)
 
 		press(view, 'CamelCase\n')
 		wanted = '''\
@@ -1014,7 +1014,7 @@
 <li bullet="*" indent="1"> <link href="CamelCase">CamelCase</link></li>
 <li bullet="*" indent="1"> </li></zim-tree>'''
 		tree = buffer.get_parsetree(raw=True)
-		self.assertEqualDiff(tree.tostring(), wanted)
+		self.assertEqual(tree.tostring(), wanted)
 
 		press(view, '\n')
 		wanted = '''\
@@ -1026,7 +1026,7 @@
 
 </zim-tree>'''
 		tree = buffer.get_parsetree(raw=True)
-		self.assertEqualDiff(tree.tostring(), wanted)
+		self.assertEqual(tree.tostring(), wanted)
 
 		# selection + * to toggle bullets
 		start = buffer.get_iter_at_line(1) # before foo
@@ -1042,7 +1042,7 @@
 </div>
 </zim-tree>'''
 		tree = buffer.get_parsetree(raw=True)
-		self.assertEqualDiff(tree.tostring(), wanted)
+		self.assertEqual(tree.tostring(), wanted)
 
 		start = buffer.get_iter_at_line(1) # before foo
 		end = buffer.get_iter_at_line(4) # empty line !
@@ -1057,7 +1057,7 @@
 
 </zim-tree>'''
 		tree = buffer.get_parsetree(raw=True)
-		self.assertEqualDiff(tree.tostring(), wanted)
+		self.assertEqual(tree.tostring(), wanted)
 
 		iter = buffer.get_iter_at_line(1)
 		iter.forward_to_line_end() # behind "foo"
@@ -1073,7 +1073,7 @@
 
 </zim-tree>'''
 		tree = buffer.get_parsetree(raw=True)
-		self.assertEqualDiff(tree.tostring(), wanted)
+		self.assertEqual(tree.tostring(), wanted)
 
 
 
@@ -1089,11 +1089,11 @@
 
 </zim-tree>'''
 		tree = buffer.get_parsetree(raw=True)
-		self.assertEqualDiff(tree.tostring(), wanted)
+		self.assertEqual(tree.tostring(), wanted)
 
 		press(view, (KEYVALS_LEFT_TAB[0],)) # Check <Shift><Tab> does not fall through to Tab when indent fails
 		tree = buffer.get_parsetree(raw=True)
-		self.assertEqualDiff(tree.tostring(), wanted)
+		self.assertEqual(tree.tostring(), wanted)
 
 		press(view, (KEYVALS_BACKSPACE[0],)) # delete bullet at once
 		wanted = '''\
@@ -1106,7 +1106,7 @@
 
 </zim-tree>'''
 		tree = buffer.get_parsetree(raw=True)
-		self.assertEqualDiff(tree.tostring(), wanted)
+		self.assertEqual(tree.tostring(), wanted)
 
 		# TODO: this test case fails, even though it works when I try it interactively !?
 		#~ press(view, (KEYVALS_BACKSPACE[0],)) # remove newline
@@ -1119,7 +1119,7 @@
 #~
 #~ </zim-tree>'''
 		#~ tree = buffer.get_parsetree(raw=True)
-		#~ self.assertEqualDiff(tree.tostring(), wanted)
+		#~ self.assertEqual(tree.tostring(), wanted)
 
 		# TODO more unindenting ?
 		# TODO checkboxes
@@ -1127,15 +1127,15 @@
 		# TODO enter on link, before link, after link
 
 
-class TestPageView(TestCase):
+class TestPageView(tests.TestCase):
 
 	def runTest(self):
-		PageView.actiongroup = MockObject() # use class attribute to fake ui init
-		PageView.actiongroup.mock_method('get_action', MockObject())
+		PageView.actiongroup = tests.MockObject() # use class attribute to fake ui init
+		PageView.actiongroup.mock_method('get_action', tests.MockObject())
 
 		ui = MockUI()
-		ui.uimanager = MockObject()
-		ui.uimanager.mock_method('get_accel_group', MockObject())
+		ui.uimanager = tests.MockObject()
+		ui.uimanager.mock_method('get_accel_group', tests.MockObject())
 
 		pageview = PageView(ui)
 		buffer = pageview.view.get_buffer()
@@ -1152,7 +1152,7 @@
 		# TODO much more here
 
 
-class TestPageviewDialogs(TestCase):
+class TestPageviewDialogs(tests.TestCase):
 
 	def runTest(self):
 		'''Test input/output of various pageview dialogs'''
@@ -1204,11 +1204,13 @@
 		self.assertEqual(dialog.form['height'], 24)
 		dialog.assert_response_ok()
 		iter = buffer.get_iter_at_offset(0)
-		self.assertEqual(buffer.get_image_data(iter), {
+		imagedata = buffer.get_image_data(iter)
+		self.assertEqual(imagedata, {
 			'src': './data/zim.png', # preserve relative path
 			'_src_file': file,
 			'height': 24,
 		})
+		self.assertEqual(type(imagedata['height']).__name__, 'int')
 
 		## Insert text from file dialog
 		ui = MockUI()
@@ -1220,9 +1222,9 @@
 
 		## Insert Link dialog
 		ui = MockUI()
-		ui.notebook.index = MockObject()
+		ui.notebook.index = tests.MockObject()
 		ui.notebook.index.mock_method('list_pages', [])
-		pageview = MockObject()
+		pageview = tests.MockObject()
 		pageview.page = Path('Test:foo:bar')
 		textview = TextView({})
 		pageview.view = textview
@@ -1252,25 +1254,27 @@
 ''')
 
 		## Word Count dialog
-		pageview = MockObject()
+		pageview = tests.MockObject()
 		pageview.view = textview
 		pageview.ui = MockUI()
 		dialog = WordCountDialog(pageview)
 		dialog.destroy() # nothing to test really
 
 
-class MockUI(MockObject):
+class MockUI(tests.MockObject):
 
 	def __init__(self):
-		MockObject.__init__(self)
+		tests.MockObject.__init__(self)
 		self.mainwindow = None
-		self.notebook = MockObject()
+		self.notebook = tests.MockObject()
 		self.preferences = ConfigDict()
 
 	def register_preferences(self, section, list):
-		for key, type, category, label, default in list:
+		for p in list:
+			key = p[0]
+			default = p[4]
 			self.preferences[section][key] = default
 
 
-class MockBuffer(MockObject):
+class MockBuffer(tests.MockObject):
 	pass

=== modified file 'tests/parsing.py'
--- tests/parsing.py	2011-02-19 16:27:44 +0000
+++ tests/parsing.py	2011-06-04 21:27:03 +0000
@@ -88,7 +88,7 @@
 	def testLinkType(self):
 		'''Test link_type()'''
 		for href, type in (
-			('zim+file://foo/bar?dus.txt', 'zim-notebook'),
+			('zim+file://foo/bar?dus.txt', 'notebook'),
 			('file://foo/bar', 'file'),
 			('http://foo/bar', 'http'),
 			('http://192.168.168.100', 'http'),

=== modified file 'tests/plugins.py'
--- tests/plugins.py	2011-02-19 16:27:44 +0000
+++ tests/plugins.py	2011-06-04 21:27:03 +0000
@@ -2,7 +2,7 @@
 
 # Copyright 2008 Jaap Karssenberg <[e-mail]>
 
-from tests import TestCase, get_test_notebook
+import tests
 
 import os
 
@@ -14,7 +14,7 @@
 zim.plugins.__path__ = [os.path.abspath('./zim/plugins')] # set back default search path
 
 
-class testPlugins(TestCase):
+class testPlugins(tests.TestCase):
 	'''FIXME'''
 
 	def testListAll(self):
@@ -35,20 +35,23 @@
 
 			# test dependencies data
 			dep = plugin.check_dependencies()
+			self.assertTrue(isinstance(dep,tuple))
+			check, dep = dep
+			self.assertTrue(isinstance(check,bool))
 			self.assertTrue(isinstance(dep,list))
 			for i in range(len(dep)):
 				self.assertTrue(isinstance(dep[i],tuple))
 				self.assertTrue(isinstance(dep[i][0],str))
 				self.assertTrue(isinstance(dep[i][1],bool))
+				self.assertTrue(isinstance(dep[i][2],bool))
 
 	def testDefaulPlugins(self):
 		'''Test loading default plugins'''
 		# Note that we use parent interface class here, so plugins
 		# will not really attach - just testing loading and prereq
 		# checks are OK.
-		notebook = get_test_notebook()
+		notebook = tests.new_notebook()
 		interface = zim.NotebookInterface(notebook)
 		interface.uistate = zim.config.ConfigDict()
 		interface.load_plugins()
 		self.assertTrue(len(interface.plugins) > 3)
-

=== modified file 'tests/printtobrowser.py'
--- tests/printtobrowser.py	2011-02-19 16:27:44 +0000
+++ tests/printtobrowser.py	2011-06-04 21:27:03 +0000
@@ -1,18 +1,16 @@
-
 # -*- coding: utf-8 -*-
 
 # Copyright 2008 Jaap Karssenberg <[e-mail]>
 
 import tests
-from tests import TestCase
 
 import zim.plugins
 from zim.notebook import Path
 from zim.config import ConfigDict
 
-class TestPrintToBrowser(TestCase):
 
-	slowTest = True
[e-mail]
+class TestPrintToBrowser(tests.TestCase):
 
 	def runTest(self):
 		'Test PrintToBrowser plugin'
@@ -30,11 +28,11 @@
 	ui_type = 'stub'
 
 	def __init__(self):
-		self.notebook = tests.get_test_notebook()
+		self.notebook = tests.new_notebook()
 		self.page = self.notebook.get_page(Path('Test:foo'))
 		self.preferences = ConfigDict()
 		self.uistate = ConfigDict()
-	
+
 	def connect(*a): pass
 
 	def connect_after(*a): pass

=== modified file 'tests/search.py'
--- tests/search.py	2010-03-15 17:29:15 +0000
+++ tests/search.py	2011-06-04 21:27:03 +0000
@@ -1,10 +1,13 @@
-
-from tests import get_test_notebook, TestCase
+# -*- coding: utf-8 -*-
+
+# Copyright 2011 Jaap Karssenberg <[e-mail]>
+
+import tests
 
 from zim.search import *
 from zim.notebook import Path
 
-class TestSearchRegex(TestCase):
+class TestSearchRegex(tests.TestCase):
 
 	def runTest(self):
 		'''Test regex compilation for search terms'''
@@ -35,10 +38,10 @@
 
 
 
-class TestSearch(TestCase):
+class TestSearch(tests.TestCase):
 
 	def setUp(self):
-		self.notebook = get_test_notebook()
+		self.notebook = tests.new_notebook()
 
 	def runTest(self):
 		'''Test search API'''
@@ -136,32 +139,33 @@
 		self.assertTrue(set(results.scores.keys()) == results)
 		self.assertTrue(all(results.scores.values()))
 
+		query = Query('Namespace: "TODOList" fix')
+		self.assertTrue(query.root.operator == OPERATOR_AND)
+		self.assertEqual(query.root, [QueryTerm('namespace', 'TODOList'), QueryTerm('contentorname', 'fix')])
+		results.search(query)
+		#~ print results
+		self.assertTrue(Path('TODOList:foo') in results)
+
+		query = Query('Tag: tags')
+		self.assertTrue(query.root.operator == OPERATOR_AND)
+		self.assertEqual(query.root, [QueryTerm('tag', 'tags')])
+		query = Query('@tags')
+		self.assertTrue(query.root.operator == OPERATOR_AND)
+		self.assertEqual(query.root, [QueryTerm('tag', 'tags')])
+		results.search(query)
+		#~ print results
+		self.assertTrue(Path('Test:tags') in results and len(results) == 1)
+
 		# TODO test ContentOrName versus Content
-		# TODO test Name and Namespace
-
-
-def get_files_notebook(name):
-	from tests import create_tmp_dir, get_test_data
-	from zim.fs import Dir
-	from zim.notebook import init_notebook, Notebook
-
-	dir = Dir(create_tmp_dir(name))
-	init_notebook(dir)
-	notebook = Notebook(dir=dir)
-	for name, text in get_test_data('wiki'):
-		page = notebook.get_page(Path(name))
-		page.parse('wiki', text)
-		notebook.store_page(page)
-
-	return notebook
-
-
+		# TODO test Name
+
+
[e-mail]
 class TestSearchFiles(TestSearch):
 
-	slowTest = True
-
 	def setUp(self):
-		self.notebook = get_files_notebook('search_TestSearchFiles')
+		path = self.create_tmp_dir()
+		self.notebook = tests.new_files_notebook(path)
 
 	def runTest(self):
 		'''Test search API with file based notebook'''

=== modified file 'tests/stores.py'
--- tests/stores.py	2011-02-19 16:27:44 +0000
+++ tests/stores.py	2011-06-04 21:27:03 +0000
@@ -13,6 +13,7 @@
 
 from zim.fs import *
 from zim.fs import FileWriteError
+from zim.errors import TrashNotSupportedError
 from zim.notebook import Notebook, Path, LookupError, PageExistsError
 import zim.stores
 from zim.formats import ParseTree
@@ -120,7 +121,7 @@
 		#~ pprint.pprint(self.index)
 		#~ pprint.pprint(names)
 		self.assertTrue(u'utf8:\u03b1\u03b2\u03b3' in names) # Check usage of unicode
-		self.assertEqualDiffData(names, self.index)
+		self.assertEqual(names, self.index)
 
 
 class TestStoresMemory(TestReadOnlyStore, tests.TestCase):
@@ -130,7 +131,7 @@
 		store = zim.stores.get_store('memory')
 		self.store = store.Store(path=Path(':'), notebook=Notebook())
 		self.index = set()
-		for name, text in tests.get_test_data('wiki'):
+		for name, text in tests.WikiTestData:
 			self.store.set_node(Path(name), text)
 			self.index.add(name)
 		self.normalize_index()
@@ -143,14 +144,14 @@
 		self.assertTrue(page.get_parsetree())
 		self.assertTrue('Foo' in ''.join(page.dump('plain')))
 		self.assertFalse(page.modified)
-		wikitext = tests.get_test_data_page('wiki', 'roundtrip')
+		wikitext = tests.WikiTestData.get('roundtrip')
 		page.parse('wiki', wikitext)
 		self.assertTrue(page.modified)
 		self.store.store_page(page)
 		self.assertFalse(page.modified)
-		self.assertEqualDiff(''.join(page.dump('wiki')), wikitext)
+		self.assertEqual(''.join(page.dump('wiki')), wikitext)
 		page = self.store.get_page(Path('Test:foo'))
-		self.assertEqualDiff(''.join(page.dump('wiki')), wikitext)
+		self.assertEqual(''.join(page.dump('wiki')), wikitext)
 
 		# check test setup OK
 		for path in (Path('Test:BAR'), Path('NewPage')):
@@ -187,7 +188,10 @@
 			self.assertFalse(page.hascontent)
 
 			# let's delete the newpath again
-			self.assertTrue(self.store.delete_page(newpath))
+			page = self.store.get_page(newpath)
+			self.assertTrue(self.store.delete_page(page))
+			self.assertFalse(page.haschildren)
+			self.assertFalse(page.hascontent)
 			page = self.store.get_page(newpath)
 			self.assertFalse(page.haschildren)
 			self.assertFalse(page.hascontent)
@@ -223,9 +227,34 @@
 		page = self.store.get_page(Path('NewPage'))
 		self.assertFalse(page.hascontent)
 
-	# TODO test getting a non-existing page
-	# TODO test if children uses namespace objects
-	# TODO test move, delete, read, write
+		# check trashing
+		trashing = True
+		try:
+			page = self.store.get_page(Path('TrashMe'))
+			self.assertTrue(page.haschildren)
+			self.assertTrue(page.hascontent)
+			self.store.trash_page(page)
+			self.assertFalse(page.haschildren)
+			self.assertFalse(page.hascontent)
+			page = self.store.get_page(Path('TrashMe'))
+			self.assertFalse(page.haschildren)
+			self.assertFalse(page.hascontent)
+		except TrashNotSupportedError:
+			trashing = False
+			print '(trashing not supported for this store)'
+			self.assertTrue(page.haschildren)
+			self.assertTrue(page.hascontent)
+			page = self.store.get_page(Path('TrashMe'))
+			self.assertTrue(page.haschildren)
+			self.assertTrue(page.hascontent)
+
+		page = self.store.get_page(Path('NonExistingPage'))
+		if trashing:
+			# fail silently for non-existing page
+			self.assertFalse(self.store.trash_page(page))
+		else:
+			# check error consistent
+			self.assertRaises(TrashNotSupportedError, self.store.trash_page, page)
 
 
 class TextXMLStore(TestReadOnlyStore, tests.TestCase):
@@ -265,17 +294,16 @@
 		page = self.store.get_page(Path('Foo:Bar'))
 		self.assertEqual(page.dump(format='wiki'), ['Foooo Barrr\n'])
 		ref = self.xml.replace("'", '"')
-		self.assertEqualDiff(''.join(self.store.dump()), ref)
-
-
+		self.assertEqual(''.join(self.store.dump()), ref)
+
+
[e-mail]
 class TestFiles(TestStoresMemory):
 	'''Test the store.files module'''
 
-	slowTest = True
-
 	def setUp(self):
 		TestStoresMemory.setUp(self)
-		tmpdir = tests.create_tmp_dir(u'stores_TestFiles_\u0421\u0430\u0439')
+		tmpdir = self.create_tmp_dir(u'_some_utf8_here_\u0421\u0430\u0439')
 		self.dir = Dir([tmpdir, 'store-files'])
 		self.mem = self.store
 		store = zim.stores.get_store('files')
@@ -349,4 +377,3 @@
 
 	def exists(self):
 		return len(self.text) > 0
-

=== added file 'tests/tags.py'
--- tests/tags.py	1970-01-01 00:00:00 +0000
+++ tests/tags.py	2011-06-04 21:27:03 +0000
@@ -0,0 +1,357 @@
+# -*- coding: utf-8 -*-
+
+# Copyright 2011 Jaap Karssenberg <[e-mail]>
+
+import tests
+
+import gtk
+import pango
+
+from zim.index import Index, IndexPath, IndexTag
+from zim.notebook import Path
+from zim.gui.pageindex import FGCOLOR_COL, \
+	EMPTY_COL, NAME_COL, PATH_COL, STYLE_COL
+	# Explicitly don't import * from pageindex, make clear what we re-use
+from zim.config import ListDict
+from zim.plugins.tags import *
+
+
+def color_to_string(color):
+	# helper method for comparing gtk.gdk.Color objects
+	return '%i,%i,%i' % (color.red, color.green, color.blue)
+
+
[e-mail]
+class TestTaggedPageTreeStore(tests.TestCase):
+
+	def setUp(self):
+		self.storeclass = TaggedPageTreeStore
+		self.viewclass = TagsPageTreeView
+		self.notebook = tests.new_notebook()
+		self.index = self.notebook.index
+
+	def runTest(self):
+		'''Test TaggedPageTreeStore index interface'''
+		# This is one big test instead of seperate sub tests because in the
+		# subclass we generate a file based notebook in setUp, and we do not
+		# want to do that many times.
+		# Hooking up the treeview as well just to see if we get any errors
+		# From the order the signals are generated.
+
+		ui = MockUI()
+		ui.notebook = self.notebook
+		ui.page = Path('Test:foo')
+		self.assertTrue(self.notebook.get_page(ui.page).exists())
+
+		treestore = self.storeclass(self.index)
+		self.assertEqual(treestore.get_flags(), 0)
+		self.assertEqual(treestore.get_n_columns(), 5)
+		treeview = self.viewclass(ui, treestore)
+		model = treeview.get_model()
+		if isinstance(model, gtk.TreeModelFilter):
+			model = model.get_model() # look inside filtered model
+		self.assertEqual(model, treestore)
+
+		self.assertEqual(treestore.get_flags(), 0)
+		self.assertEqual(treestore.get_n_columns(), 5)
+
+		self.index.update(callback=tests.gtk_process_events)
+		tests.gtk_process_events()
+
+		#~ treeview = PageTreeView(None) # just run hidden to check errors
+		#~ treeview.set_model(treestore)
+
+		n = treestore.on_iter_n_children(None)
+		self.assertTrue(n > 0)
+		n = treestore.iter_n_children(None)
+		self.assertTrue(n > 0)
+
+		for i in range(treestore.get_n_columns()):
+			self.assertTrue(not treestore.get_column_type(i) is None)
+
+		# Quick check for basic methods
+		iter = treestore.on_get_iter((0,))
+		self.assertTrue(isinstance(iter, (PageTreeIter, PageTreeTagIter)))
+		if self.storeclass is TaggedPageTreeStore:
+			self.assertTrue(isinstance(iter, PageTreeIter))
+			self.assertTrue(isinstance(iter.indexpath, IndexPath))
+			self.assertFalse(iter.indexpath.isroot)
+		else:
+			self.assertTrue(isinstance(iter, PageTreeTagIter))
+			self.assertTrue(isinstance(iter.indextag, IndexTag))
+		basename = treestore.on_get_value(iter, 0)
+		self.assertTrue(len(basename) > 0)
+		self.assertEqual(iter.treepath, (0,))
+		self.assertEqual(treestore.on_get_path(iter), (0,))
+		if self.storeclass is TaggedPageTreeStore:
+			self.assertEqual(treestore.get_treepath(iter.indexpath), (0,))
+			self.assertEqual(treestore.get_treepath(Path(iter.indexpath.name)), (0,))
+		else:
+			self.assertEqual(treestore.get_treepath(iter.indextag), (0,))
+
+		iter2 = treestore.on_iter_children(None)
+		if self.storeclass is TaggedPageTreeStore:
+			self.assertEqual(iter2.indexpath, iter.indexpath)
+		else:
+			self.assertEqual(iter2.indextag, iter.indextag)
+
+		self.assertTrue(treestore.on_get_iter((20,20,20,20,20)) is None)
+		self.assertTrue(treestore.get_treepath(Path('nonexisting')) is None)
+		self.assertRaises(ValueError, treestore.get_treepath, Path(':'))
+
+		# Now walk through the whole tree testing the API
+		nitems = 0
+		path = (0,)
+		prevpath = None
+		while path:
+			#~ print '>>', path
+			assert path != prevpath, 'Prevent infinite loop'
+			nitems += 1
+			prevpath = path
+
+			iter = treestore.get_iter(path)
+			self.assertEqual(treestore.get_path(iter), tuple(path))
+
+			if isinstance(treestore.on_get_iter(path), PageTreeIter):
+				self._check_indexpath_iter(treestore, iter, path)
+			else:
+				self._check_indextag_iter(treestore, iter, path)
+
+			# Determine how to continue
+			if treestore.iter_has_child(iter):
+				path = path + (0,)
+			else:
+				path = path[:-1] + (path[-1]+1,) # increase last member
+				while path:
+					try:
+						treestore.get_iter(path)
+					except ValueError:
+						path = path[:-1]
+						if len(path):
+							path = path[:-1] + (path[-1]+1,) # increase last member
+					else:
+						break
+
+		self.assertTrue(nitems > 10) # double check sanity of loop
+
+		# Check if all the signals go OK
+		treestore.disconnect_index()
+		del treestore
+		self.index.flush()
+		treestore = self.storeclass(self.index)
+		treeview = TagsPageTreeView(ui, treestore)
+		self.index.update(callback=tests.gtk_process_events)
+
+		# Try some TreeView methods
+		path = Path('Test:foo')
+		self.assertTrue(treeview.select_page(path))
+		self.assertEqual(treeview.get_selected_path(), path)
+		treepath = treeview.get_model().get_treepath(path)
+		self.assertTrue(not treepath is None)
+		col = treeview.get_column(0)
+		treeview.row_activated(treepath, col)
+
+		#~ treeview.emit('popup-menu')
+		treeview.emit('insert-link', path)
+		treeview.emit('copy')
+
+		# Check if all the signals go OK in delete
+		for page in reversed(list(self.notebook.walk())): # delete bottom up
+			self.notebook.delete_page(page)
+			tests.gtk_process_events()
+
+	def _check_indexpath_iter(self, treestore, iter, path):
+		# checks specific for nodes that map to IndexPath object
+		indexpath = treestore.get_indexpath(iter)
+		self.assertTrue(path in treestore.get_treepaths(indexpath))
+
+		page = self.notebook.get_page(indexpath)
+		self.assertEqual(treestore.get_value(iter, NAME_COL), page.basename)
+		self.assertEqual(treestore.get_value(iter, PATH_COL), page)
+		if page.hascontent or page.haschildren:
+			self.assertEqual(treestore.get_value(iter, EMPTY_COL), False)
+			self.assertEqual(treestore.get_value(iter, STYLE_COL), pango.STYLE_NORMAL)
+			self.assertEqual(
+				color_to_string( treestore.get_value(iter, FGCOLOR_COL) ),
+				color_to_string( treestore.NORMAL_COLOR) )
+		else:
+			self.assertEqual(treestore.get_value(iter, EMPTY_COL), True)
+			self.assertEqual(treestore.get_value(iter, STYLE_COL), pango.STYLE_ITALIC)
+			self.assertEqual(
+				color_to_string( treestore.get_value(iter, FGCOLOR_COL) ),
+				color_to_string( treestore.EMPTY_COLOR) )
+
+		self._check_iter_children(treestore, iter, path, indexpath.haschildren)
+
+	def _check_indextag_iter(self, treestore, iter, path):
+		# checks specific for nodes that map to IndexTag object
+		self.assertTrue(treestore.get_indexpath(iter) is None)
+
+		indextag = treestore.get_indextag(iter)
+		self.assertTrue(path in treestore.get_treepaths(indextag))
+
+		self.assertEqual(treestore.get_value(iter, NAME_COL), indextag.name)
+		self.assertEqual(treestore.get_value(iter, PATH_COL), indextag)
+		if indextag == treestore.untagged:
+			self.assertEqual(treestore.get_value(iter, EMPTY_COL), True)
+			self.assertEqual(treestore.get_value(iter, STYLE_COL), pango.STYLE_ITALIC)
+			self.assertEqual(
+				color_to_string( treestore.get_value(iter, FGCOLOR_COL) ),
+				color_to_string( treestore.EMPTY_COLOR) )
+		else:
+			self.assertEqual(treestore.get_value(iter, EMPTY_COL), False)
+			self.assertEqual(treestore.get_value(iter, STYLE_COL), pango.STYLE_NORMAL)
+			self.assertEqual(
+				color_to_string( treestore.get_value(iter, FGCOLOR_COL) ),
+				color_to_string( treestore.NORMAL_COLOR) )
+
+		if indextag == treestore.untagged:
+			haschildren = self.index.n_list_untagged_root_pages() > 0
+		else:
+			haschildren = self.index.n_list_tagged_pages(indextag) > 0
+		self._check_iter_children(treestore, iter, path, haschildren)
+
+	def _check_iter_children(self, treestore, iter, path, haschildren):
+		# Check API for children is consistent
+		if haschildren:
+			self.assertTrue(treestore.iter_has_child(iter))
+			child = treestore.iter_children(iter)
+			self.assertTrue(not child is None)
+			child = treestore.iter_nth_child(iter, 0)
+			self.assertTrue(not child is None)
+			parent = treestore.iter_parent(child)
+			self.assertEqual(treestore.get_path(parent), path)
+			childpath = treestore.get_path(child)
+			self.assertEqual(
+				childpath, tuple(path) + (0,))
+			n = treestore.iter_n_children(iter)
+			for i in range(1, n):
+				child = treestore.iter_next(child)
+				childpath = treestore.get_path(child)
+				self.assertEqual(
+					childpath, tuple(path) + (i,))
+			child = treestore.iter_next(child)
+			self.assertTrue(child is None)
+		else:
+			self.assertTrue(not treestore.iter_has_child(iter))
+			child = treestore.iter_children(iter)
+			self.assertTrue(child is None)
+			child = treestore.iter_nth_child(iter, 0)
+			self.assertTrue(child is None)
+
+
[e-mail]
+class TestTagsPageTreeStore(TestTaggedPageTreeStore):
+
+	def setUp(self):
+		TestTaggedPageTreeStore.setUp(self)
+		self.storeclass = TagsPageTreeStore
+		self.viewclass = TagsPageTreeView
+
+	def runTest(self):
+		'''Test TagsPageTreeStore index interface'''
+		TestTaggedPageTreeStore.runTest(self)
+
+
[e-mail]
+class TestTagPluginWidget(tests.TestCase):
+
+	def runTest(self):
+		ui = MockUI()
+		ui.notebook = tests.new_notebook()
+
+		plugin = tests.MockObject()
+		plugin.ui = ui
+		plugin.uistate = ListDict()
+
+		widget = TagsPluginWidget(plugin)
+
+		# Excersize all model switches and check we still have a sane state
+		widget.toggle_treeview()
+		widget.toggle_treeview()
+
+		path = Path('Test:foo')
+		treepath = widget.treeview.get_model().get_treepath(path)
+		self.assertTrue(not treepath is None)
+
+		widget.disconnect_model()
+		widget.reload_model()
+
+		path = Path('Test:foo')
+		treepath = widget.treeview.get_model().get_treepath(path)
+		self.assertTrue(not treepath is None)
+
+		# Check signals
+		#~ widget.treeview.emit('popup-menu')
+		widget.treeview.emit('insert-link', path)
+
+		# Check tag filtering
+		cloud = widget.tagcloud
+		self.assertEqual(cloud.get_tag_filter(), None)
+		tag = None
+		for button in cloud.get_children():
+			if button.indextag.name == 'tags':
+				tag = button.indextag
+				button.clicked()
+				break
+		else:
+			raise AssertionError, 'No button for @tags ?'
+
+		selected, filtered = cloud.get_tag_filter()
+		self.assertEqual(selected, [tag])
+		self.assertTrue(len(filtered) > 3)
+		self.assertTrue(tag in filtered)
+
+		self.assertTrue(not widget.treeview._tag_filter is None)
+
+		# check filtering in treestore
+		tagfilter = (selected, filtered)
+		filtered = frozenset(filtered)
+
+		def toplevel(model):
+			iter = model.get_iter_first()
+			assert not iter is None
+			while not iter is None:
+				yield iter
+				iter = model.iter_next(iter)
+
+		def childiter(model, iter):
+			iter = model.iter_children(iter)
+			assert not iter is None
+			while not iter is None:
+				yield iter
+				iter = model.iter_next(iter)
+
+		self.assertEqual(plugin.uistate['treeview'], 'tagged')
+		filteredmodel = widget.treeview.get_model()
+		for iter in toplevel(filteredmodel):
+			path = filteredmodel.get_indexpath(iter)
+			self.assertTrue(not path is None)
+			tags = list(ui.notebook.index.list_tags(path))
+			tags = frozenset(tags)
+			self.assertTrue(tags >= filtered)
+			treepaths = filteredmodel.get_treepaths(path)
+			self.assertTrue(filteredmodel.get_path(iter) in treepaths)
+
+		widget.toggle_treeview()
+		self.assertEqual(plugin.uistate['treeview'], 'tags')
+		filteredmodel = widget.treeview.get_model()
+		for iter in toplevel(filteredmodel):
+			self.assertEqual(filteredmodel.get_indexpath(iter), None)
+				# toplevel has tags, not pages
+			tag = filteredmodel[iter][PATH_COL]
+			self.assertTrue(tag in filtered)
+			for iter in childiter(filteredmodel, iter):
+				path = filteredmodel.get_indexpath(iter)
+				self.assertTrue(not path is None)
+				tags = list(ui.notebook.index.list_tags(path))
+				tags = frozenset(tags)
+				self.assertTrue(tags >= filtered)
+				treepaths = filteredmodel.get_treepaths(path)
+				self.assertTrue(filteredmodel.get_path(iter) in treepaths)
+
+
+class MockUI(tests.MockObject):
+
+	page = None
+	notebook = None

=== modified file 'tests/tasklist.py'
--- tests/tasklist.py	2011-02-19 16:27:44 +0000
+++ tests/tasklist.py	2011-06-04 21:27:03 +0000
@@ -2,16 +2,17 @@
 
 # Copyright 2011 Jaap Karssenberg <[e-mail]>
 
-from tests import TestCase, MockObject, get_test_notebook
+import tests
+
 
 import zim.plugins
 import zim.config
 import zim.formats
 
 
-class TestTaskList(TestCase):
+class TestTaskList(tests.TestCase):
 
-	def runTest(self):
+	def testIndexing(self):
 		'''Check indexing of tasklist plugin'''
 		klass = zim.plugins.get_plugin('tasklist')
 		ui = MockUI()
@@ -49,24 +50,32 @@
 		tasks = plugin.extract_tasks(tree)
 		labels = [task[-1] for task in tasks]
 		self.assertEqual(labels, ['A', 'B', 'C', 'D', 'E', 'FIXME: dus'])
-		self.assertEqualDiff(tree.tostring(), origtree)
+		self.assertEqual(tree.tostring(), origtree)
 			# extract should not modify the tree
 
 		plugin.preferences['all_checkboxes'] = False
 		tasks = plugin.extract_tasks(tree)
 		labels = [task[-1] for task in tasks]
 		self.assertEqual(labels, ['A', 'B', 'C', 'FIXME: dus'])
-		self.assertEqualDiff(tree.tostring(), origtree)
+		self.assertEqual(tree.tostring(), origtree)
 			# extract should not modify the tree