Fix and test query filtering by q objects

django_mock_queries/query.py

@@ -44,21 +44,24 @@ def remove(**attrs):
     mock_set.remove = MagicMock(side_effect=remove)
 
     def filter_q(source, query):
-        results = list(source)
+        results = []
 
-        filtered = []
         for exp in query.children:
-            filtered.append(MockSet(*matches(*items, **{exp[0]: exp[1]}), cls=cls))
+            filtered = list(matches(*source, **{exp[0]: exp[1]}))
 
-        if query.connector == CONNECTORS_OR:
-            for filter_results in filtered:
-                results = merge(results, list(filter_results))
-        elif query.connector == CONNECTORS_AND:
-            for filter_results in filtered:
-                results = intersect(results, list(filter_results))
+            if not results:
+                results = filtered
+                continue
+
+            if query.connector == CONNECTORS_OR:
+                results = merge(results, filtered)
+            elif query.connector == CONNECTORS_AND:
+                results = intersect(results, filtered)
 
         return results
 
+    mock_set.filter_q = MagicMock(side_effect=filter_q)
+
     def filter(*args, **attrs):
         results = list(items)
         for x in args:

tests/test_query.py

@@ -1,5 +1,7 @@
+from mock import MagicMock
 from unittest import TestCase
 
+from django_mock_queries.constants import CONNECTORS_OR, CONNECTORS_AND
 from django_mock_queries.query import MockSet, MockModel
 
 
@@ -39,6 +41,32 @@ def test_query_filters_items_by_attributes(self):
         assert item_2 in results
         assert item_3 not in results
 
+    def test_query_filters_items_by_q_object_or(self):
+        item_1 = MockModel(mock_name='#1', foo=1)
+        item_2 = MockModel(mock_name='#2', foo=2)
+        item_3 = MockModel(mock_name='#3', foo=3)
+
+        source = [item_1, item_2, item_3]
+        query = MagicMock(connector=CONNECTORS_OR, children=[('foo', 1), ('foo', 2)])
+        results = self.mock_set.filter_q(source, query)
+
+        assert item_1 in results
+        assert item_2 in results
+        assert item_3 not in results
+
+    def test_query_filters_items_by_q_object_and(self):
+        item_1 = MockModel(mock_name='#1', foo=1, bar='a')
+        item_2 = MockModel(mock_name='#2', foo=1, bar='b')
+        item_3 = MockModel(mock_name='#3', foo=3, bar='b')
+
+        source = [item_1, item_2, item_3]
+        query = MagicMock(connector=CONNECTORS_AND, children=[('foo', 1), ('bar', 'b')])
+        results = self.mock_set.filter_q(source, query)
+
+        assert item_1 not in results
+        assert item_2 in results
+        assert item_3 not in results
+
     def test_query_clears_all_items_from_set(self):
         self.mock_set.add(1, 2, 3)
         self.mock_set.clear()