From 9a1a4cd0ac4c9586d302f1bf167398d08671b91f Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 13 Dec 2016 10:46:50 +0530 Subject: [PATCH] Fixed test cases for item / warehouse renaming --- erpnext/stock/doctype/item/test_item.py | 5 ++--- erpnext/stock/doctype/warehouse/test_warehouse.py | 14 +++++++++++++- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/erpnext/stock/doctype/item/test_item.py b/erpnext/stock/doctype/item/test_item.py index 52cf10dfce..706fd5a1f4 100644 --- a/erpnext/stock/doctype/item/test_item.py +++ b/erpnext/stock/doctype/item/test_item.py @@ -174,7 +174,7 @@ class TestItem(unittest.TestCase): variant.item_name = "_Test Numeric Variant Large 1.5m" variant.save() - def test_item_merging(self): + def test_item_merging(self): create_item("Test Item for Merging 1") create_item("Test Item for Merging 2") @@ -191,8 +191,7 @@ class TestItem(unittest.TestCase): {"item_code": "Test Item for Merging 2", "warehouse": "_Test Warehouse - _TC"})) self.assertTrue(frappe.db.get_value("Bin", - {"item_code": "Test Item for Merging - 2", "warehouse": "_Test Warehouse 1 - _TC"})) - + {"item_code": "Test Item for Merging 2", "warehouse": "_Test Warehouse 1 - _TC"})) def make_item_variant(): if not frappe.db.exists("Item", "_Test Variant Item-S"): diff --git a/erpnext/stock/doctype/warehouse/test_warehouse.py b/erpnext/stock/doctype/warehouse/test_warehouse.py index c9c4b5f9d2..edc5400547 100644 --- a/erpnext/stock/doctype/warehouse/test_warehouse.py +++ b/erpnext/stock/doctype/warehouse/test_warehouse.py @@ -4,6 +4,7 @@ from __future__ import unicode_literals from frappe.model.rename_doc import rename_doc from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry from frappe.utils import cint +from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import set_perpetual_inventory import frappe import unittest @@ -25,6 +26,7 @@ class TestWarehouse(unittest.TestCase): self.assertEquals(child_warehouse.is_group, 0) def test_warehouse_renaming(self): + set_perpetual_inventory(1) create_warehouse("Test Warehouse for Renaming 1") self.assertTrue(frappe.db.exists("Account", "Test Warehouse for Renaming 1 - _TC")) @@ -32,6 +34,8 @@ class TestWarehouse(unittest.TestCase): filters={"warehouse": "Test Warehouse for Renaming 1 - _TC"})) # Rename with abbr + if frappe.db.exists("Warehouse", "Test Warehouse for Renaming 2 - _TC"): + frappe.delete_doc("Warehouse", "Test Warehouse for Renaming 2 - _TC") rename_doc("Warehouse", "Test Warehouse for Renaming 1 - _TC", "Test Warehouse for Renaming 2 - _TC") self.assertTrue(frappe.db.exists("Account", "Test Warehouse for Renaming 2 - _TC")) @@ -39,13 +43,20 @@ class TestWarehouse(unittest.TestCase): filters={"warehouse": "Test Warehouse for Renaming 2 - _TC"})) # Rename without abbr + if frappe.db.exists("Warehouse", "Test Warehouse for Renaming 3 - _TC"): + frappe.delete_doc("Warehouse", "Test Warehouse for Renaming 3 - _TC") + rename_doc("Warehouse", "Test Warehouse for Renaming 2 - _TC", "Test Warehouse for Renaming 3") self.assertTrue(frappe.db.exists("Account", "Test Warehouse for Renaming 3 - _TC")) self.assertTrue(frappe.db.get_value("Account", filters={"warehouse": "Test Warehouse for Renaming 3 - _TC"})) + + set_perpetual_inventory(0) def test_warehouse_merging(self): + set_perpetual_inventory(1) + create_warehouse("Test Warehouse for Merging 1") create_warehouse("Test Warehouse for Merging 2") @@ -76,7 +87,8 @@ class TestWarehouse(unittest.TestCase): self.assertTrue(frappe.db.get_value("Account", filters={"warehouse": "Test Warehouse for Merging 2 - _TC"})) - + set_perpetual_inventory(0) + def create_warehouse(warehouse_name): if not frappe.db.exists("Warehouse", warehouse_name + " - _TC"): w = frappe.new_doc("Warehouse")