From fb0b87db3d15d4cfa47322479a89aab7baa2b69b Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Sat, 2 Apr 2022 12:00:08 +1100
Subject: [PATCH] Further unit test fixes
---
InvenTree/part/test_api.py | 18 ++++++++++++++++++
InvenTree/stock/test_api.py | 6 +++---
InvenTree/stock/tests.py | 4 ++--
3 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/InvenTree/part/test_api.py b/InvenTree/part/test_api.py
index 56a32c2cb5..a813fcd832 100644
--- a/InvenTree/part/test_api.py
+++ b/InvenTree/part/test_api.py
@@ -910,6 +910,12 @@ class PartAPIAggregationTest(InvenTreeAPITestCase):
self.assertEqual(in_stock, 126)
self.assertEqual(data['unallocated_stock'], in_stock)
+ # Check that model functions return the same values
+ self.assertEqual(part.build_order_allocation_count(), 0)
+ self.assertEqual(part.sales_order_allocation_count(), 0)
+ self.assertEqual(part.total_stock, in_stock)
+ self.assertEqual(part.available_stock(), in_stock)
+
# Now, let's create a sales order, and allocate some stock
so = order.models.SalesOrder.objects.create(
reference='001',
@@ -1000,6 +1006,12 @@ class PartAPIAggregationTest(InvenTreeAPITestCase):
self.assertEqual(data['in_stock'], 91)
self.assertEqual(data['unallocated_stock'], 66)
+ # Again, check that the direct model functions return the same values
+ self.assertEqual(part.build_order_allocation_count(), 10)
+ self.assertEqual(part.sales_order_allocation_count(), 15)
+ self.assertEqual(part.total_stock, 91)
+ self.assertEqual(part.available_stock(), 66)
+
# Allocate further stock against the build
build.models.BuildItem.objects.create(
build=bo,
@@ -1016,6 +1028,12 @@ class PartAPIAggregationTest(InvenTreeAPITestCase):
self.assertEqual(data['in_stock'], 91)
self.assertEqual(data['unallocated_stock'], 56)
+ # Again, check that the direct model functions return the same values
+ self.assertEqual(part.build_order_allocation_count(), 20)
+ self.assertEqual(part.sales_order_allocation_count(), 15)
+ self.assertEqual(part.total_stock, 91)
+ self.assertEqual(part.available_stock(), 56)
+
class BomItemTest(InvenTreeAPITestCase):
"""
diff --git a/InvenTree/stock/test_api.py b/InvenTree/stock/test_api.py
index e078c74189..73bee54110 100644
--- a/InvenTree/stock/test_api.py
+++ b/InvenTree/stock/test_api.py
@@ -142,7 +142,7 @@ class StockItemListTest(StockAPITestCase):
self.assertEqual(len(response), 9)
response = self.get_stock(location=7)
- self.assertEqual(len(response), 16)
+ self.assertEqual(len(response), 18)
def test_filter_by_depleted(self):
"""
@@ -249,7 +249,7 @@ class StockItemListTest(StockAPITestCase):
self.assertEqual(len(response), 4)
response = self.get_stock(expired=0)
- self.assertEqual(len(response), 16)
+ self.assertEqual(len(response), 25)
def test_paginate(self):
"""
@@ -313,7 +313,7 @@ class StockItemListTest(StockAPITestCase):
dataset = self.export_data({'part': 25})
- self.assertEqual(len(dataset), 8)
+ self.assertEqual(len(dataset), 17)
class StockItemTest(StockAPITestCase):
diff --git a/InvenTree/stock/tests.py b/InvenTree/stock/tests.py
index 50f77a593b..97639b15bd 100644
--- a/InvenTree/stock/tests.py
+++ b/InvenTree/stock/tests.py
@@ -167,8 +167,8 @@ class StockTest(TestCase):
self.assertFalse(self.drawer2.has_items())
# Drawer 3 should have three stock items
- self.assertEqual(self.drawer3.stock_items.count(), 16)
- self.assertEqual(self.drawer3.item_count, 16)
+ self.assertEqual(self.drawer3.stock_items.count(), 18)
+ self.assertEqual(self.drawer3.item_count, 18)
def test_stock_count(self):
part = Part.objects.get(pk=1)