all service-layer tests now services [services_tests_all_services]

hjwp · hjwp · commit 8c8c1f57a52a · 2020-01-08T20:41:36.000Z
diff --git a/test_services.py b/test_services.py
@@ -6,12 +6,6 @@
 
 class FakeRepository(repository.AbstractRepository):
 
-    @staticmethod
-    def for_batch(ref, sku, qty, eta=None):
-        return FakeRepository([
-            model.Batch(ref, sku, qty, eta),
-        ])
-
     def __init__(self, batches):
         self._batches = set(batches)
 
@@ -34,25 +28,29 @@ def commit(self):
 
 def test_add_batch():
     repo, session = FakeRepository([]), FakeSession()
-    services.add_batch('b1', 'CRUNCHY-ARMCHAIR', 100, None, repo, session)
-    assert repo.get('b1') is not None
+    services.add_batch("b1", "CRUNCHY-ARMCHAIR", 100, None, repo, session)
+    assert repo.get("b1") is not None
     assert session.committed
 
 
-def test_returns_allocation():
-    repo = FakeRepository.for_batch("batch1", "COMPLICATED-LAMP", 100, eta=None)
-    result = services.allocate("o1", "COMPLICATED-LAMP", 10, repo, FakeSession())
+def test_allocate_returns_allocation():
+    repo, session = FakeRepository([]), FakeSession()
+    services.add_batch("batch1", "COMPLICATED-LAMP", 100, None, repo, session)
+    result = services.allocate("o1", "COMPLICATED-LAMP", 10, repo, session)
     assert result == "batch1"
 
 
-def test_error_for_invalid_sku():
-    repo = FakeRepository.for_batch('b1', 'AREALSKU', 100, eta=None)
+def test_allocate_errors_for_invalid_sku():
+    repo, session = FakeRepository([]), FakeSession()
+    services.add_batch("b1", "AREALSKU", 100, None, repo, session)
+
     with pytest.raises(services.InvalidSku, match="Invalid sku NONEXISTENTSKU"):
         services.allocate("o1", "NONEXISTENTSKU", 10, repo, FakeSession())
 
 
 def test_commits():
-    repo = FakeRepository.for_batch("b1", "OMINOUS-MIRROR", 100, eta=None)
+    repo, session = FakeRepository([]), FakeSession()
     session = FakeSession()
+    services.add_batch("b1", "OMINOUS-MIRROR", 100, None, repo, session)
     services.allocate("o1", "OMINOUS-MIRROR", 10, repo, session)
     assert session.committed is True
