From 5447be8b5281b50b128c76e10f26d6b19ca4f5e4 Mon Sep 17 00:00:00 2001
From: richard-dds <richard-ctr@friends.dds.mil>
Date: Fri, 16 Nov 2018 11:42:33 -0500
Subject: [PATCH] Use FormCache everywhere

---
 atst/utils/form_cache.py       | 16 ++--------------
 tests/utils/test_form_cache.py | 18 ++++++++++++------
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/atst/utils/form_cache.py b/atst/utils/form_cache.py
index 8ee831b7..1769cee3 100644
--- a/atst/utils/form_cache.py
+++ b/atst/utils/form_cache.py
@@ -6,18 +6,6 @@ import pickle
 DEFAULT_CACHE_NAME = "formcache"
 
 
-def cache_form_data(redis, formdata, expiry_seconds=3600, key_prefix=DEFAULT_CACHE_NAME):
-    value = pickle.dumps(formdata)
-    key = hashlib.sha1(os.urandom(64)).hexdigest()
-    redis.setex(name="{}:{}".format(key_prefix, key), value=value, time=expiry_seconds)
-    return key
-
-
-def retrieve_form_data(redis, formdata_key, key_prefix="formcache"):
-    data = redis.get("{}:{}".format(key_prefix, formdata_key))
-    return pickle.loads(data)
-
-
 class FormCache(object):
 
     def __init__(self, redis):
@@ -28,13 +16,13 @@ class FormCache(object):
         if cache_key:
             return self.read(cache_key)
 
-    def write(self, formdata, expiry_seconds=3600, key_prefix="formcache"):
+    def write(self, formdata, expiry_seconds=3600, key_prefix=DEFAULT_CACHE_NAME):
         value = pickle.dumps(formdata)
         hash_ = hashlib.sha1(os.urandom(64)).hexdigest()
         self.redis.setex(name=self._key(key_prefix, hash_), value=value, time=expiry_seconds)
         return hash_
 
-    def read(self, formdata_key, key_prefix="formcache"):
+    def read(self, formdata_key, key_prefix=DEFAULT_CACHE_NAME):
         data = self.redis.get(self._key(key_prefix, formdata_key))
         return pickle.loads(data) if data is not None else {}
 
diff --git a/tests/utils/test_form_cache.py b/tests/utils/test_form_cache.py
index 7eaabeee..f59b9ef5 100644
--- a/tests/utils/test_form_cache.py
+++ b/tests/utils/test_form_cache.py
@@ -1,15 +1,21 @@
+import pytest
 from werkzeug.datastructures import ImmutableDict
 
-from atst.utils.form_cache import DEFAULT_CACHE_NAME, cache_form_data, retrieve_form_data
+from atst.utils.form_cache import DEFAULT_CACHE_NAME, FormCache
 
-def test_cache_form_data(app):
+
+@pytest.fixture
+def form_cache(app):
+    return FormCache(app.redis)
+
+def test_cache_form_data(app, form_cache):
     data = ImmutableDict({"kessel_run": "12 parsecs"})
-    key = cache_form_data(app.redis, data)
+    key = form_cache.write(data)
     assert app.redis.get("{}:{}".format(DEFAULT_CACHE_NAME, key))
 
 
-def test_retrieve_form_data(app):
+def test_retrieve_form_data(form_cache):
     data = ImmutableDict({"class": "corellian"})
-    key = cache_form_data(app.redis, data)
-    retrieved = retrieve_form_data(app.redis, key)
+    key = form_cache.write(data)
+    retrieved = form_cache.read(key)
     assert retrieved == data