Refactor .values() tests into separate cases

Add failing test case for selecting individual hstore keys
through a foreign key relationship.

Author: Photonios

tests/test_query.py

@@ -6,40 +6,6 @@
 from .fake_model import get_fake_model
 
 
-def test_values_hstore_key():
-    """Tests whether selecting only certain hstore keys using the
-    query set's .values() method works properly."""
-
-    model_fk = get_fake_model({
-        'first_name': models.CharField(max_length=255),
-        'last_name': models.CharField(max_length=255)
-    })
-
-    model = get_fake_model({
-        'title': HStoreField(),
-        'fk': models.ForeignKey(model_fk)
-    })
-
-    fk = model_fk.objects.create(first_name='Swen', last_name='Kooij')
-    obj = model.objects.create(title={'en': 'english', 'ar': 'arabic'}, fk=fk)
-
-    # ensure that selecting only certain keys from a hstore field works
-    result = list(model.objects.values('title__en', 'fk__first_name', 'title__ar'))[0]
-    assert result['title__en'] == obj.title['en']
-    assert result['title__ar'] == obj.title['ar']
-
-    # make sure that selecting the whole hstore field works properly
-    result = list(model.objects.values('fk__first_name', 'title'))[0]
-    assert result['title'] == obj.title
-
-    # make sure .values_list() also works properly
-    result = list(model.objects.values_list('title__en', 'title__ar'))[0]
-    assert result[0] == obj.title['en']
-    assert result[1] == obj.title['ar']
-
-    result = list(model.objects.values_list('title__en', 'title__ar'))[0]
-
-
 def test_annotate_hstore_key_ref():
     """Tests whether annotating using a :see:HStoreRef expression
     works correctly.

tests/test_query_values.py

@@ -0,0 +1,73 @@
+import pytest
+
+from collections import namedtuple
+
+from django.db.models import CharField, ForeignKey
+
+from psqlextra import HStoreField
+from psqlextra.expressions import HStoreRef
+
+from .fake_model import get_fake_model
+
+
+@pytest.fixture
+def model():
+    """Test models, where the first model has a foreign
+    key relationship to the second."""
+
+    return get_fake_model({
+        'title': HStoreField(),
+    })
+
+
+@pytest.fixture
+def modelobj(model):
+    """Data for the test models, one row per model."""
+
+    return model.objects.create(title={'en': 'english', 'ar': 'arabic'})
+
+
+def test_values_hstore(model, modelobj):
+    """Tests that selecting all the keys properly works
+    and returns a :see:LocalizedValue instance."""
+
+    result = list(model.objects.values('title'))[0]
+    assert result['title'] == modelobj.title
+
+
+def test_values_hstore_key(model, modelobj):
+    """Tests whether selecting a single key from a :see:HStoreField
+    using the query set's .values() works properly."""
+
+    result = list(model.objects.values('title__en', 'title__ar'))[0]
+    assert result['title__en'] == modelobj.title['en']
+    assert result['title__ar'] == modelobj.title['ar']
+
+
+def test_values_list_hstore_key(model, modelobj):
+    """Tests that selecting a single key from a :see:HStoreField
+    using the query set's .values_list() works properly."""
+
+    result = list(model.objects.values_list('title__en', 'title__ar'))[0]
+    assert result[0] == modelobj.title['en']
+    assert result[1] == modelobj.title['ar']
+
+
+def test_values_hstore_key_through_fk():
+    """Tests whether selecting a single key from a :see:HStoreField
+    using the query set's .values() works properly when there's a
+    foreign key relationship involved."""
+
+    fmodel = get_fake_model({
+        'name': HStoreField()
+    })
+
+    model = get_fake_model({
+        'fk': ForeignKey(fmodel)
+    })
+
+    fobj = fmodel.objects.create(name={'en': 'swen', 'ar': 'arabic swen'})
+    obj = model.objects.create(fk=fobj)
+
+    result = list(model.objects.values('fk__name__ar'))[0]
+    assert result['fk__name__ar'] == fobj.name['ar']