1.1 --- a/MoinMoin/_tests/test_wikiutil.py	Tue Feb 10 13:21:59 2009 +0100
     1.2 +++ b/MoinMoin/_tests/test_wikiutil.py	Wed Feb 11 02:34:33 2009 +0100
     1.3 @@ -11,6 +11,8 @@
     1.4  
     1.5  from MoinMoin import config, wikiutil
     1.6  
     1.7 +from werkzeug.utils import MultiDict
     1.8 +
     1.9  
    1.10  class TestQueryStringSupport:
    1.11      tests = [
    1.12 @@ -21,17 +23,13 @@
    1.13      ]
    1.14      def testParseQueryString(self):
    1.15          for qstr, expected_str, expected_unicode in self.tests:
    1.16 -            assert wikiutil.parseQueryString(qstr, want_unicode=False) == expected_str
    1.17 -            assert wikiutil.parseQueryString(qstr, want_unicode=True) == expected_unicode
    1.18 -            assert wikiutil.parseQueryString(unicode(qstr), want_unicode=False) == expected_str
    1.19 -            assert wikiutil.parseQueryString(unicode(qstr), want_unicode=True) == expected_unicode
    1.20 +            assert wikiutil.parseQueryString(qstr) == MultiDict(expected_unicode)
    1.21 +            assert wikiutil.parseQueryString(unicode(qstr)) == MultiDict(expected_unicode)
    1.22  
    1.23      def testMakeQueryString(self):
    1.24          for qstr, in_str, in_unicode in self.tests:
    1.25 -            assert wikiutil.parseQueryString(wikiutil.makeQueryString(in_unicode, want_unicode=False), want_unicode=False) == in_str
    1.26 -            assert wikiutil.parseQueryString(wikiutil.makeQueryString(in_str, want_unicode=False), want_unicode=False) == in_str
    1.27 -            assert wikiutil.parseQueryString(wikiutil.makeQueryString(in_unicode, want_unicode=True), want_unicode=True) == in_unicode
    1.28 -            assert wikiutil.parseQueryString(wikiutil.makeQueryString(in_str, want_unicode=True), want_unicode=True) == in_unicode
    1.29 +            assert wikiutil.parseQueryString(wikiutil.makeQueryString(in_unicode)) == MultiDict(in_unicode)
    1.30 +            assert wikiutil.parseQueryString(wikiutil.makeQueryString(in_str)) == MultiDict(in_unicode)
    1.31  
    1.32  
    1.33  class TestTickets: