Potential 3.5 unit test dix

tests/unit/test_base.py

@@ -45,7 +45,7 @@ def test_can_filter_by_property_comparison(self):
 class QueryDecoratorTests(TestCase):
 
     def setUp(self):
-        self.f = lambda s: OrderedDict([(1, 2), (3, 4), (5, 6)])
+        self.f = lambda s: {1: 2, 3: 4, 5: 6}
 
 
     def test_can_get_unfiltered_objects(self):
@@ -55,20 +55,18 @@ def test_can_get_unfiltered_objects(self):
 
     @patch("atomium.base.filter_objects")
     def test_can_get_filtered_objects(self, mock_filter):
-        mock_filter.side_effect = [{10: 20}, {30: 40}]
+        mock_filter.side_effect = [{10: 20}]
         f = query(self.f)
-        self.assertEqual(f(self, a=1, b=2), {40})
+        self.assertEqual(f(self, a=1), {20})
         mock_filter.assert_any_call({1: 2, 3: 4, 5: 6}, "a", 1)
-        mock_filter.assert_any_call({10: 20}, "b", 2)
 
 
     @patch("atomium.base.filter_objects")
     def test_can_get_filtered_objects_as_tuple(self, mock_filter):
-        mock_filter.side_effect = [{1: 2}, {3: 4}]
+        mock_filter.side_effect = [{1: 2}]
         f = query(self.f, tuple_=True)
-        self.assertEqual(f(self, a=1, b=2), (4,))
+        self.assertEqual(f(self, a=1), (2,))
         mock_filter.assert_any_call({1: 2, 3: 4, 5: 6}, "a", 1)
-        mock_filter.assert_any_call({1: 2}, "b", 2)
 
 
     def test_can_get_objects_by_id(self):

tests/unit/test_data.py

@@ -1,3 +1,4 @@
+from collections import OrderedDict
 from datetime import date
 from unittest import TestCase
 from unittest.mock import Mock, patch, PropertyMock, MagicMock
@@ -48,10 +49,10 @@ def test_can_create_chains(self, mock_chain, mock_het):
         residues = [Mock() for _ in range(6)]
         mock_het.side_effect = residues
         chains = create_chains({
-         "polymer": {
-          "A": {"residues": {1: {"number": 4}, 3: {"number": 2}}, "internal_id": "1", "sequence": "GH"},
-          "B": {"residues": {5: {"number": 6}, 7: {"number": 8}}, "internal_id": "2", "sequence": "AL"},
-         }
+         "polymer": OrderedDict([
+          ("A", {"residues": {1: {"number": 4}, 3: {"number": 2}}, "internal_id": "1", "sequence": "GH"}),
+          ("B", {"residues": {5: {"number": 6}, 7: {"number": 8}}, "internal_id": "2", "sequence": "AL"}),
+         ])
         })
         mock_het.assert_any_call({"number": 4}, 1)
         mock_het.assert_any_call({"number": 2}, 3)