1 files changed, 85 insertions, 47 deletions
diff --git a/sources/pyside2/tests/QtCore/qurl_test.py b/sources/pyside2/tests/QtCore/qurl_test.py
index 595e5931f..d5eb37d6e 100644
--- a/sources/pyside2/tests/QtCore/qurl_test.py
+++ b/sources/pyside2/tests/QtCore/qurl_test.py
@@ -33,6 +33,7 @@
 import unittest
 
 from PySide2.QtCore import QUrl
+from PySide2.QtCore import QUrlQuery
 
 class QUrlBasicConstructor(unittest.TestCase):
     '''Tests the basic constructors'''
@@ -67,59 +68,96 @@ class QUrlBasicConstructor(unittest.TestCase):
         self.assertEqual(url.toString(),
                         'ftp://john:abc123@www.google.com:8080/mail/view')
 
+class QueryItemsTest(unittest.TestCase):
+    '''Test query item management'''
+
+    def testQueryItems(self):
+        url = QUrl('http://www.google.com/search?q=python&hl=en')
+        valid_data = [(('q'), ('python')), (('hl'), ('en'))]
+
+        self.assertEqual(sorted(QUrlQuery(url.query()).queryItems()), sorted(valid_data))
+
+    def testEncodedQueryItems(self):
+        url = QUrl('http://www.google.com/search?q=python&hl=en')
+        valid_data = [(('q'), ('python')), (('hl'), ('en'))]
+
+        self.assertEqual(sorted(QUrlQuery(url.query()).queryItems()), sorted(valid_data))
+
+    def testSetQueryItems(self):
+        urla = QUrl('http://www.google.com/search?q=python&hl=en')
+        urlb = QUrl('http://www.google.com/search')
+
+        urlb.setQuery(urla.query())
+
+        self.assertEqual(urla, urlb)
+
+    def testAddQueryItem(self):
+        url = QUrlQuery()
+        valid_data = [('hl', 'en'), ('user', 'konqui')]
+
+        url.addQueryItem(*valid_data[0])
+        self.assertEqual(url.queryItems()[0], valid_data[0])
+
+        url.addQueryItem(*valid_data[1])
+        self.assertEqual(sorted(url.queryItems()), sorted(valid_data))
+
+    def testAllQueryItemsValues(self):
+        url = QUrlQuery()
+        key = 'key'
+        valid_data = ['data', 'valid', 'test']
+
+        for i, data in enumerate(valid_data):
+            url.addQueryItem(key, data)
+            self.assertEqual(url.allQueryItemValues(key),
+                          list(valid_data[:i+1]))
+
     def testPath(self):
         url = QUrl("http://qt-project.org/images/ban/pgs_front.jpg")
         self.assertEqual(url.path(), "/images/ban/pgs_front.jpg")
 
 # PYSIDE-345: No bindings for QUrlQuery
-# class QueryItemsTest(unittest.TestCase):
-#     '''Test query item management'''
-#
-#     def testQueryItems(self):
-#         #QUrl.queryItems
-#         url = QUrl('http://www.google.com/search?q=python&hl=en')
-#         valid_data = [(('q'), ('python')), (('hl'), ('en'))]
-#
-#         self.assertEqual(sorted(url.queryItems()), sorted(valid_data))
-#
-# def testEncodedQueryItems(self):
-#         #QUrl.encodedQueryItems
-#         url = QUrl('http://www.google.com/search?q=python&hl=en')
-#         valid_data = [(('q'), ('python')), (('hl'), ('en'))]
-#
-#         self.assertEqual(sorted(url.encodedQueryItems()), sorted(valid_data))
-#
-#     def testSetQueryItems(self):
-#         #QUrl.setQueryItems
-#         urla = QUrl('http://www.google.com/search?q=python&hl=en')
-#         urlb = QUrl('http://www.google.com/search')
-#
-#         urlb.setQueryItems(urla.queryItems())
-#
-#         self.assertEqual(urla, urlb)
-#
-#     def testAddQueryItem(self):
-#         #QUrl.addQueryItem
-#         url = QUrl()
-#         valid_data = [('hl', 'en'), ('user', 'konqui')]
-#
-#         url.addQueryItem(*valid_data[0])
-#         self.assertEqual(url.queryItems()[0], valid_data[0])
-#
-#         url.addQueryItem(*valid_data[1])
-#         self.assertEqual(sorted(url.queryItems()), sorted(valid_data))
-#
-#     def testAllEncodedQueryItemsValues(self):
-#         #QUrl.allEncodedQueryItemValues
-#         url = QUrl()
-#         key = 'key'
-#         valid_data = ['data', 'valid', 'test']
-#
-#         for i, data in enumerate(valid_data):
-#             url.addQueryItem(key, data)
-#             self.assertEqual(url.allEncodedQueryItemValues(key),
-#                              list(valid_data[:i+1]))
+class QueryItemsTest(unittest.TestCase):
+    '''Test query item management'''
+
+    def testQueryItems(self):
+        url = QUrl('http://www.google.com/search?q=python&hl=en')
+        valid_data = [(('q'), ('python')), (('hl'), ('en'))]
+
+        self.assertEqual(sorted(QUrlQuery(url.query()).queryItems()), sorted(valid_data))
+
+    def testEncodedQueryItems(self):
+        url = QUrl('http://www.google.com/search?q=python&hl=en')
+        valid_data = [(('q'), ('python')), (('hl'), ('en'))]
+
+        self.assertEqual(sorted(QUrlQuery(url.query()).queryItems()), sorted(valid_data))
+
+    def testSetQueryItems(self):
+        urla = QUrl('http://www.google.com/search?q=python&hl=en')
+        urlb = QUrl('http://www.google.com/search')
+
+        urlb.setQuery(urla.query())
+
+        self.assertEqual(urla, urlb)
+
+    def testAddQueryItem(self):
+        url = QUrlQuery()
+        valid_data = [('hl', 'en'), ('user', 'konqui')]
+
+        url.addQueryItem(*valid_data[0])
+        self.assertEqual(url.queryItems()[0], valid_data[0])
+
+        url.addQueryItem(*valid_data[1])
+        self.assertEqual(sorted(url.queryItems()), sorted(valid_data))
+
+    def testAllQueryItemsValues(self):
+        url = QUrlQuery()
+        key = 'key'
+        valid_data = ['data', 'valid', 'test']
 
+        for i, data in enumerate(valid_data):
+            url.addQueryItem(key, data)
+            self.assertEqual(url.allQueryItemValues(key),
+                             list(valid_data[:i+1]))
 
 if __name__ == '__main__':
     unittest.main()