From ad07eec3e1a0ead8127870967378edfb9e569b37 Mon Sep 17 00:00:00 2001
From: Tikitu de Jager <tikitu@minddistrict.com>
Date: Mon, 7 Mar 2016 21:37:18 +0200
Subject: [PATCH] Make tests pass

---
 src/documents/models.py              | 15 +++++++++++++++
 src/documents/tests/test_consumer.py | 15 +++++++--------
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/documents/models.py b/src/documents/models.py
index e60a699d2..94dc60102 100644
--- a/src/documents/models.py
+++ b/src/documents/models.py
@@ -87,6 +87,21 @@ class FileInfo(object):
         return FileInfo(
             title=m.group(1), tags=(), suffix=get_suffix(m.group(2)))
 
+    @property
+    def title(self):
+        return self._title
+
+    @property
+    def correspondent(self):
+        return self._correspondent
+
+    @property
+    def tags(self):
+        return self._tags
+
+    @property
+    def suffix(self):
+        return self._suffix
 
 class SluggedModel(models.Model):
 
diff --git a/src/documents/tests/test_consumer.py b/src/documents/tests/test_consumer.py
index 04f92f98c..0e4c9d368 100644
--- a/src/documents/tests/test_consumer.py
+++ b/src/documents/tests/test_consumer.py
@@ -1,12 +1,11 @@
 from django.test import TestCase
 
-from ..consumer import Consumer
+from ..models import FileInfo
 
 
 class TestAttachment(TestCase):
 
     TAGS = ("tag1", "tag2", "tag3")
-    CONSUMER = Consumer()
     SUFFIXES = (
         "pdf", "png", "jpg", "jpeg", "gif",
         "PDF", "PNG", "JPG", "JPEG", "GIF",
@@ -16,14 +15,14 @@ class TestAttachment(TestCase):
     def _test_guess_attributes_from_name(self, path, sender, title, tags):
         for suffix in self.SUFFIXES:
             f = path.format(suffix)
-            results = self.CONSUMER._guess_attributes_from_name(f)
-            self.assertEqual(results[0].name, sender, f)
-            self.assertEqual(results[1], title, f)
-            self.assertEqual(tuple([t.slug for t in results[2]]), tags, f)
+            file_info = FileInfo.from_path(f)
+            self.assertEqual(file_info.correspondent.name, sender, f)
+            self.assertEqual(file_info.title, title, f)
+            self.assertEqual(tuple([t.slug for t in file_info.tags]), tags, f)
             if suffix.lower() == "jpeg":
-                self.assertEqual(results[3], "jpg", f)
+                self.assertEqual(file_info.suffix, "jpg", f)
             else:
-                self.assertEqual(results[3], suffix.lower(), f)
+                self.assertEqual(file_info.suffix, suffix.lower(), f)
 
     def test_guess_attributes_from_name0(self):
         self._test_guess_attributes_from_name(