From 4ad2d63c8ab20464fdb24d12a217babbbfe5ed24 Mon Sep 17 00:00:00 2001
From: Michael Ilsaas <mikeri@mikeri.net>
Date: Thu, 21 Jan 2016 18:37:46 +0100
Subject: [PATCH] Shortened urlincdec tests to one and some styling

---
 qutebrowser/utils/urlutils.py     |  4 ++--
 tests/unit/utils/test_urlutils.py | 31 ++++++++++---------------------
 2 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/qutebrowser/utils/urlutils.py b/qutebrowser/utils/urlutils.py
index cef5dfa57..9e76aa29a 100644
--- a/qutebrowser/utils/urlutils.py
+++ b/qutebrowser/utils/urlutils.py
@@ -527,8 +527,8 @@ def incdec_number(url, incdec, segments=None):
         if zeroes:
             if len(number) < len(str(val)):
                 zeroes = zeroes[1:]
-            if len(number) > len(str(val)):
-                zeroes = ''.join([zeroes, '0'])
+            elif len(number) > len(str(val)):
+                zeroes += '0'
 
         new_value = ''.join([pre, zeroes, str(val), post])
         setter(new_value)
diff --git a/tests/unit/utils/test_urlutils.py b/tests/unit/utils/test_urlutils.py
index cffa3d81b..11fbc6148 100644
--- a/tests/unit/utils/test_urlutils.py
+++ b/tests/unit/utils/test_urlutils.py
@@ -586,32 +586,21 @@ class TestIncDecNumber:
             base_url, incdec, segments={'host', 'path', 'query', 'anchor'})
         assert new_url == expected_url
 
-    @pytest.mark.parametrize('number, expected', [
-        ('01', '02'),
-        ('09', '10'),
-        ('009', '010')
-        ])
-    def test_increment_leading_zeroes(self, number, expected):
+    @pytest.mark.parametrize('number, expected, incdec', [
+        ('01', '02', 'increment'),
+        ('09', '10', 'increment'),
+        ('009', '010', 'increment'),
+        ('02', '01', 'decrement'),
+        ('10', '9', 'decrement'),
+        ('010', '009', 'decrement')
+    ])
+    def test_incdec_leading_zeroes(self, number, expected, incdec):
         """Test incdec_number with leading zeroes."""
         url = 'http://example.com/{}'
         base_url = QUrl(url.format(number))
         expected_url = QUrl(url.format(expected))
         new_url = urlutils.incdec_number(
-                base_url, 'increment', segments={'path'})
-        assert new_url == expected_url
-
-    @pytest.mark.parametrize('number, expected', [
-        ('02', '01'),
-        ('10', '9'),
-        ('010', '009')
-        ])
-    def test_decrement_leading_zeroes(self, number, expected):
-        """Test incdec_number with leading zeroes."""
-        url = 'http://example.com/{}'
-        base_url = QUrl(url.format(number))
-        expected_url = QUrl(url.format(expected))
-        new_url = urlutils.incdec_number(
-                base_url, 'decrement', segments={'path'})
+                base_url, incdec, segments={'path'})
         assert new_url == expected_url
 
     @pytest.mark.parametrize('url, segments, expected', [