From 0f2e7e2395e8c51b3635969406b438a96e73e424 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer <markus@unterwaditzer.net>
Date: Sat, 11 Feb 2017 19:24:38 +0100
Subject: [PATCH] More tests

---
 tests/unit/test_repair.py | 24 +++++++++++++++++++++---
 vdirsyncer/repair.py      |  2 +-
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/tests/unit/test_repair.py b/tests/unit/test_repair.py
index 9a1c796..05cc810 100644
--- a/tests/unit/test_repair.py
+++ b/tests/unit/test_repair.py
@@ -1,9 +1,10 @@
-
 from hypothesis import given, settings
 
+import pytest
+
 from tests import uid_strategy
 
-from vdirsyncer.repair import repair_storage
+from vdirsyncer.repair import repair_item, repair_storage
 from vdirsyncer.storage.memory import MemoryStorage
 from vdirsyncer.utils import href_safe
 from vdirsyncer.utils.vobject import Item
@@ -38,7 +39,6 @@ def test_repair_uids(uid):
 def test_repair_unsafe_uids(uid):
     s = MemoryStorage()
     item = Item(u'BEGIN:VCARD\nUID:{}\nEND:VCARD'.format(uid))
-    print(repr(item.raw))
     href, etag = s.upload(item)
     assert s.get(href)[0].uid == uid
     assert not href_safe(uid)
@@ -49,3 +49,21 @@ def test_repair_unsafe_uids(uid):
     assert href_safe(new_href)
     newuid = s.get(new_href)[0].uid
     assert href_safe(newuid)
+
+
+@pytest.mark.parametrize('uid,href', [
+    ('b@dh0mbr3', 'perfectly-fine'),
+    ('perfectly-fine', 'b@dh0mbr3')
+])
+def test_repair_unsafe_href(uid, href):
+    item = Item('BEGIN:VCARD\nUID:{}\nEND:VCARD'.format(uid))
+    new_item = repair_item(href, item, set(), True)
+    assert new_item.raw != item.raw
+    assert new_item.uid != item.uid
+    assert href_safe(new_item.uid)
+
+
+def test_repair_do_nothing():
+    item = Item('BEGIN:VCARD\nUID:justfine\nEND:VCARD')
+    assert repair_item('fine', item, set(), True) is item
+    assert repair_item('@@@@/fine', item, set(), True) is item
diff --git a/vdirsyncer/repair.py b/vdirsyncer/repair.py
index 5dddff1..0624d76 100644
--- a/vdirsyncer/repair.py
+++ b/vdirsyncer/repair.py
@@ -60,7 +60,7 @@ def repair_item(href, item, seen_uids, repair_unsafe_uid):
                            '--repair-unsafe-uid to repair.')
         else:
             logger.warning('UID or href is unsafe, assigning random UID.')
-            new_item = item.with_uid(generate_href(item.uid))
+            new_item = item.with_uid(generate_href())
 
     if not new_item.uid:
         raise IrreparableItem()