Skip to content

Commit 2a583b1

Browse files
committed
continue fixing ids, fix bug
1 parent a24daa3 commit 2a583b1

1 file changed

Lines changed: 16 additions & 18 deletions

File tree

‎test_allocation.py‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,18 @@ def random_id():
1717

1818

1919
def test_can_allocate_to_stock():
20-
sku = random_id()
21-
order = [OrderLine(sku=sku, quantity=10)]
22-
stock = [Line(sku=sku, quantity=1000)]
20+
order = [OrderLine(sku='a-sku', quantity=10)]
21+
stock = [Line(sku='a-sku', quantity=1000)]
2322

2423
allocate(order, stock, shipments=[])
2524

2625
assert order[0].allocation == 'STOCK'
2726

2827

2928
def test_can_allocate_to_shipment():
30-
sku = random_id()
31-
order = [OrderLine(sku=sku, quantity=10)]
32-
shipment = Shipment(id=random_id(), eta=date.today(), lines=[
33-
Line(sku=sku, quantity=1000),
29+
order = [OrderLine(sku='a-sku', quantity=10)]
30+
shipment = Shipment(id='shipment-id', eta=date.today(), lines=[
31+
Line(sku='a-sku', quantity=1000),
3432
])
3533

3634
allocate(order, stock=[], shipments=[shipment])
@@ -41,7 +39,7 @@ def test_can_allocate_to_shipment():
4139
def test_ignores_invalid_stock():
4240
order = [OrderLine(sku='sku1', quantity=10), ]
4341
stock = [Line(sku='sku2', quantity=1000)]
44-
shipment = Shipment(id=random_id(), eta=date.today(), lines=[
42+
shipment = Shipment(id='shipment-id', eta=date.today(), lines=[
4543
Line(sku='sku1', quantity=1000),
4644
])
4745

@@ -52,10 +50,10 @@ def test_ignores_invalid_stock():
5250

5351
def test_can_allocate_to_correct_shipment():
5452
order = [OrderLine(sku='sku2', quantity=10)]
55-
shipment1 = Shipment(id=random_id(), eta=date.today(), lines=[
53+
shipment1 = Shipment('shipment1', eta=date.today(), lines=[
5654
Line(sku='sku1', quantity=1000),
5755
])
58-
shipment2 = Shipment(id=random_id(), eta=date.today(), lines=[
56+
shipment2 = Shipment('shipment2', eta=date.today(), lines=[
5957
Line(sku='sku2', quantity=1000),
6058
])
6159

@@ -68,7 +66,7 @@ def test_allocates_to_stock_in_preference_to_shipment():
6866
sku = random_id()
6967
order = [OrderLine(sku=sku, quantity=10)]
7068
stock = [Line(sku=sku, quantity=1000)]
71-
shipment = Shipment(id=random_id(), eta=date.today(), lines=[
69+
shipment = Shipment('shipment1', eta=date.today(), lines=[
7270
Line(sku=sku, quantity=1000),
7371
])
7472

@@ -97,7 +95,7 @@ def test_can_allocate_multiple_lines_to_shipment():
9795
OrderLine(sku='sku1', quantity=10),
9896
OrderLine(sku='sku2', quantity=10),
9997
]
100-
shipment = Shipment(id=random_id(), eta=date.today(), lines=[
98+
shipment = Shipment('shipment1', eta=date.today(), lines=[
10199
Line(sku='sku1', quantity=1000),
102100
Line(sku='sku2', quantity=1000),
103101
])
@@ -113,7 +111,7 @@ def test_can_allocate_to_both():
113111
OrderLine(sku='sku1', quantity=10),
114112
OrderLine(sku='sku2', quantity=10),
115113
]
116-
shipment = Shipment(id=random_id(), eta=date.today(), lines=[
114+
shipment = Shipment('shipment1', eta=date.today(), lines=[
117115
Line(sku='sku2', quantity=1000),
118116
])
119117
stock = [Line(sku='sku1', quantity=1000)]
@@ -131,7 +129,7 @@ def test_can_allocate_to_both_preferring_stock():
131129
OrderLine(sku='sku3', quantity=10),
132130
OrderLine(sku='sku4', quantity=10),
133131
]
134-
shipment = Shipment(id=random_id(), eta=date.today(), lines=[
132+
shipment = Shipment('shipment1', eta=date.today(), lines=[
135133
Line(sku='sku1', quantity=1000),
136134
Line(sku='sku2', quantity=1000),
137135
Line(sku='sku3', quantity=1000),
@@ -154,7 +152,7 @@ def test_mixed_allocations_are_avoided_if_possible():
154152
OrderLine(sku='sku1', quantity=10),
155153
OrderLine(sku='sku2', quantity=10),
156154
]
157-
shipment = Shipment(id=random_id(), eta=date.today(), lines=[
155+
shipment = Shipment('shipment1', eta=date.today(), lines=[
158156
Line(sku='sku1', quantity=1000),
159157
Line(sku='sku2', quantity=1000),
160158
])
@@ -171,12 +169,12 @@ def test_prefer_allocating_to_earlier_shipment():
171169
OrderLine(sku='sku1', quantity=10),
172170
OrderLine(sku='sku2', quantity=10),
173171
]
174-
shipment1 = Shipment(id=random_id(), eta=date.today(), lines=[
172+
shipment1 = Shipment('shipment1', eta=date.today(), lines=[
175173
Line(sku='sku1', quantity=1000),
176174
Line(sku='sku2', quantity=1000),
177175
])
178176
tomorrow = date.today() + timedelta(days=1)
179-
shipment2 = Shipment(id=random_id(), eta=tomorrow, lines=[
177+
shipment2 = Shipment('shipment2', eta=tomorrow, lines=[
180178
Line(sku='sku1', quantity=1000),
181179
Line(sku='sku2', quantity=1000),
182180
])
@@ -203,7 +201,7 @@ def test_prefer_allocating_to_earlier_even_if_multiple_shipments():
203201
Line(sku='sku3', quantity=1000),
204202
])
205203
later = tomorrow + timedelta(days=1)
206-
shipment3 = Shipment(id='shipment2', eta=later, lines=[
204+
shipment3 = Shipment(id='shipment3', eta=later, lines=[
207205
Line(sku='sku2', quantity=1000),
208206
Line(sku='sku3', quantity=1000),
209207
])

0 commit comments

Comments
 (0)