Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Paul Graydon
erp5
Commits
667bea00
Commit
667bea00
authored
May 18, 2017
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ERP5 tests: Simplify testItem
Create size_base helper variable, which allows to make test non-sequential.
parent
e43ca64b
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
23 additions
and
28 deletions
+23
-28
product/ERP5/tests/testItem.py
product/ERP5/tests/testItem.py
+23
-28
No files found.
product/ERP5/tests/testItem.py
View file @
667bea00
...
@@ -412,8 +412,7 @@ class TestItem(TestItemMixin, ERP5TypeTestCase):
...
@@ -412,8 +412,7 @@ class TestItem(TestItemMixin, ERP5TypeTestCase):
organisation
=
self
.
createOrganisation
(
title
=
'Organisation I'
)
organisation
=
self
.
createOrganisation
(
title
=
'Organisation I'
)
self
.
tic
()
self
.
tic
()
resource
=
self
.
createVariatedResource
()
resource
=
self
.
createVariatedResource
()
# XXX this tests depends on the relative url of the resource
size_base
=
'size/%s'
%
(
resource
.
getRelativeUrl
(),)
self
.
assertEqual
(
'product_module/1'
,
resource
.
getRelativeUrl
())
self
.
tic
()
self
.
tic
()
packing_list
=
self
.
createPackingList
(
resource
=
resource
,
organisation
=
organisation
)
packing_list
=
self
.
createPackingList
(
resource
=
resource
,
organisation
=
organisation
)
packing_list_line
=
self
.
createPackingListLine
(
packing_list
=
packing_list
,
packing_list_line
=
self
.
createPackingListLine
(
packing_list
=
packing_list
,
...
@@ -428,19 +427,19 @@ class TestItem(TestItemMixin, ERP5TypeTestCase):
...
@@ -428,19 +427,19 @@ class TestItem(TestItemMixin, ERP5TypeTestCase):
'title'
:
'Lot A'
,
'title'
:
'Lot A'
,
'reference'
:
'20_05_09_LA'
,
'reference'
:
'20_05_09_LA'
,
'quantity'
:
20.0
,
'quantity'
:
20.0
,
'line_variation_category_list'
:
'size/product_module/1
/3'
,
'line_variation_category_list'
:
size_base
+
'
/3'
,
},
},
{
'listbox_key'
:
'001'
,
{
'listbox_key'
:
'001'
,
'title'
:
'Lot B'
,
'title'
:
'Lot B'
,
'reference'
:
'20_05_09_LB'
,
'reference'
:
'20_05_09_LB'
,
'quantity'
:
10.0
,
'quantity'
:
10.0
,
'line_variation_category_list'
:
'size/product_module/1
/2'
,
'line_variation_category_list'
:
size_base
+
'
/2'
,
},
},
{
'listbox_key'
:
'002'
,
{
'listbox_key'
:
'002'
,
'title'
:
'Lot C'
,
'title'
:
'Lot C'
,
'reference'
:
'20_05_09_LC'
,
'reference'
:
'20_05_09_LC'
,
'quantity'
:
15.0
,
'quantity'
:
15.0
,
'line_variation_category_list'
:
'size/product_module/1
/1'
,
'line_variation_category_list'
:
size_base
+
'
/1'
,
},
},
)
)
...
@@ -461,9 +460,9 @@ class TestItem(TestItemMixin, ERP5TypeTestCase):
...
@@ -461,9 +460,9 @@ class TestItem(TestItemMixin, ERP5TypeTestCase):
self
.
assertEqual
(
packing_list_line
.
getTotalQuantity
(),
45.0
)
self
.
assertEqual
(
packing_list_line
.
getTotalQuantity
(),
45.0
)
self
.
assertEqual
(
sorted
(
packing_list_line
.
getVariationCategoryList
()),
self
.
assertEqual
(
sorted
(
packing_list_line
.
getVariationCategoryList
()),
sorted
([
'size/product_module/1
/3'
,
sorted
([
size_base
+
'
/3'
,
'size/product_module/1
/2'
,
size_base
+
'
/2'
,
'size/product_module/1
/1'
]))
size_base
+
'
/1'
]))
self
.
assertEqual
(
packing_list_line
.
getAggregateTitleList
(),
[])
self
.
assertEqual
(
packing_list_line
.
getAggregateTitleList
(),
[])
movement_cell_list
=
packing_list_line
.
contentValues
(
movement_cell_list
=
packing_list_line
.
contentValues
(
...
@@ -471,17 +470,17 @@ class TestItem(TestItemMixin, ERP5TypeTestCase):
...
@@ -471,17 +470,17 @@ class TestItem(TestItemMixin, ERP5TypeTestCase):
self
.
assertEqual
(
3
,
len
(
movement_cell_list
))
self
.
assertEqual
(
3
,
len
(
movement_cell_list
))
cell
=
packing_list_line
.
getCell
(
base_id
=
'movement'
,
cell
=
packing_list_line
.
getCell
(
base_id
=
'movement'
,
*
(
'size/product_module/1
/3'
,
))
*
(
size_base
+
'
/3'
,
))
self
.
assertEqual
(
cell
.
getQuantity
(),
20
)
self
.
assertEqual
(
cell
.
getQuantity
(),
20
)
self
.
assertEqual
([
'Lot A'
],
cell
.
getAggregateTitleList
())
self
.
assertEqual
([
'Lot A'
],
cell
.
getAggregateTitleList
())
cell
=
packing_list_line
.
getCell
(
base_id
=
'movement'
,
cell
=
packing_list_line
.
getCell
(
base_id
=
'movement'
,
*
(
'size/product_module/1
/2'
,
))
*
(
size_base
+
'
/2'
,
))
self
.
assertEqual
(
cell
.
getQuantity
(),
10
)
self
.
assertEqual
(
cell
.
getQuantity
(),
10
)
self
.
assertEqual
([
'Lot B'
],
cell
.
getAggregateTitleList
())
self
.
assertEqual
([
'Lot B'
],
cell
.
getAggregateTitleList
())
cell
=
packing_list_line
.
getCell
(
base_id
=
'movement'
,
cell
=
packing_list_line
.
getCell
(
base_id
=
'movement'
,
*
(
'size/product_module/1
/1'
,
))
*
(
size_base
+
'
/1'
,
))
self
.
assertEqual
(
cell
.
getQuantity
(),
15
)
self
.
assertEqual
(
cell
.
getQuantity
(),
15
)
self
.
assertEqual
([
'Lot C'
],
cell
.
getAggregateTitleList
())
self
.
assertEqual
([
'Lot C'
],
cell
.
getAggregateTitleList
())
...
@@ -490,9 +489,7 @@ class TestItem(TestItemMixin, ERP5TypeTestCase):
...
@@ -490,9 +489,7 @@ class TestItem(TestItemMixin, ERP5TypeTestCase):
organisation
=
self
.
createOrganisation
(
title
=
'Organisation II'
)
organisation
=
self
.
createOrganisation
(
title
=
'Organisation II'
)
self
.
tic
()
self
.
tic
()
resource
=
self
.
createVariatedResource
()
resource
=
self
.
createVariatedResource
()
# XXX this tests depends on the relative url of the resource
size_base
=
'size/%s'
%
(
resource
.
getRelativeUrl
(),)
self
.
assertEqual
(
'product_module/2'
,
resource
.
getRelativeUrl
())
self
.
tic
()
self
.
tic
()
packing_list
=
self
.
createPackingList
(
resource
=
resource
,
organisation
=
organisation
)
packing_list
=
self
.
createPackingList
(
resource
=
resource
,
organisation
=
organisation
)
...
@@ -504,12 +501,12 @@ class TestItem(TestItemMixin, ERP5TypeTestCase):
...
@@ -504,12 +501,12 @@ class TestItem(TestItemMixin, ERP5TypeTestCase):
'title'
:
'Lot A2'
,
'title'
:
'Lot A2'
,
'reference'
:
'25_05_09_LA2'
,
'reference'
:
'25_05_09_LA2'
,
'quantity'
:
20.0
,
'quantity'
:
20.0
,
'line_variation_category_list'
:
'size/product_module/2
/3'
,
'line_variation_category_list'
:
size_base
+
'
/3'
,
},
},
)
)
packing_list_line
.
DeliveryLine_createItemList
(
type
=
'Item'
,
listbox
=
listbox
)
packing_list_line
.
DeliveryLine_createItemList
(
type
=
'Item'
,
listbox
=
listbox
)
self
.
assertEqual
(
packing_list_line
.
getVariationCategoryList
(),
self
.
assertEqual
(
packing_list_line
.
getVariationCategoryList
(),
[
'size/product_module/2
/3'
])
[
size_base
+
'
/3'
])
self
.
assertEqual
(
packing_list_line
.
getTotalQuantity
(),
20
)
self
.
assertEqual
(
packing_list_line
.
getTotalQuantity
(),
20
)
# create listbox a second time
# create listbox a second time
...
@@ -517,13 +514,13 @@ class TestItem(TestItemMixin, ERP5TypeTestCase):
...
@@ -517,13 +514,13 @@ class TestItem(TestItemMixin, ERP5TypeTestCase):
'title'
:
'Lot B2'
,
'title'
:
'Lot B2'
,
'reference'
:
'25_05_09_LB2'
,
'reference'
:
'25_05_09_LB2'
,
'quantity'
:
20.0
,
'quantity'
:
20.0
,
'line_variation_category_list'
:
'size/product_module/2
/1'
,
'line_variation_category_list'
:
size_base
+
'
/1'
,
},
},
{
'listbox_key'
:
'001'
,
{
'listbox_key'
:
'001'
,
'title'
:
'Lot C2'
,
'title'
:
'Lot C2'
,
'reference'
:
'25_05_09_LC2'
,
'reference'
:
'25_05_09_LC2'
,
'quantity'
:
15.0
,
'quantity'
:
15.0
,
'line_variation_category_list'
:
'size/product_module/2
/2'
,
'line_variation_category_list'
:
size_base
+
'
/2'
,
},
},
)
)
packing_list_line
.
DeliveryLine_createItemList
(
type
=
'Item'
,
listbox
=
listbox
)
packing_list_line
.
DeliveryLine_createItemList
(
type
=
'Item'
,
listbox
=
listbox
)
...
@@ -531,26 +528,26 @@ class TestItem(TestItemMixin, ERP5TypeTestCase):
...
@@ -531,26 +528,26 @@ class TestItem(TestItemMixin, ERP5TypeTestCase):
self
.
assertEqual
(
packing_list_line
.
getTotalQuantity
(),
55.0
)
self
.
assertEqual
(
packing_list_line
.
getTotalQuantity
(),
55.0
)
self
.
assertEqual
(
sorted
(
packing_list_line
.
getVariationCategoryList
()),
self
.
assertEqual
(
sorted
(
packing_list_line
.
getVariationCategoryList
()),
sorted
([
'size/product_module/2
/1'
,
sorted
([
size_base
+
'
/1'
,
'size/product_module/2
/2'
,
size_base
+
'
/2'
,
'size/product_module/2
/3'
]))
size_base
+
'
/3'
]))
movement_cell_list
=
packing_list_line
.
contentValues
(
movement_cell_list
=
packing_list_line
.
contentValues
(
portal_type
=
'Purchase Packing List Cell'
)
portal_type
=
'Purchase Packing List Cell'
)
self
.
assertEqual
(
3
,
len
(
movement_cell_list
))
self
.
assertEqual
(
3
,
len
(
movement_cell_list
))
cell
=
packing_list_line
.
getCell
(
base_id
=
'movement'
,
cell
=
packing_list_line
.
getCell
(
base_id
=
'movement'
,
*
(
'size/product_module/2
/3'
,
))
*
(
size_base
+
'
/3'
,
))
self
.
assertEqual
(
cell
.
getQuantity
(),
20
)
self
.
assertEqual
(
cell
.
getQuantity
(),
20
)
self
.
assertEqual
([
'Lot A2'
],
cell
.
getAggregateTitleList
())
self
.
assertEqual
([
'Lot A2'
],
cell
.
getAggregateTitleList
())
cell
=
packing_list_line
.
getCell
(
base_id
=
'movement'
,
cell
=
packing_list_line
.
getCell
(
base_id
=
'movement'
,
*
(
'size/product_module/2
/1'
,
))
*
(
size_base
+
'
/1'
,
))
self
.
assertEqual
(
cell
.
getQuantity
(),
20
)
self
.
assertEqual
(
cell
.
getQuantity
(),
20
)
self
.
assertEqual
([
'Lot B2'
],
cell
.
getAggregateTitleList
())
self
.
assertEqual
([
'Lot B2'
],
cell
.
getAggregateTitleList
())
cell
=
packing_list_line
.
getCell
(
base_id
=
'movement'
,
cell
=
packing_list_line
.
getCell
(
base_id
=
'movement'
,
*
(
'size/product_module/2
/2'
,
))
*
(
size_base
+
'
/2'
,
))
self
.
assertEqual
(
cell
.
getQuantity
(),
15
)
self
.
assertEqual
(
cell
.
getQuantity
(),
15
)
self
.
assertEqual
([
'Lot C2'
],
cell
.
getAggregateTitleList
())
self
.
assertEqual
([
'Lot C2'
],
cell
.
getAggregateTitleList
())
...
@@ -614,9 +611,7 @@ class TestItem(TestItemMixin, ERP5TypeTestCase):
...
@@ -614,9 +611,7 @@ class TestItem(TestItemMixin, ERP5TypeTestCase):
organisation
=
self
.
createOrganisation
(
title
=
'Organisation VI'
)
organisation
=
self
.
createOrganisation
(
title
=
'Organisation VI'
)
self
.
tic
()
self
.
tic
()
resource
=
self
.
createVariatedResource
()
resource
=
self
.
createVariatedResource
()
# XXX this tests depends on the relative url of the resource
size_base
=
'size/%s'
%
(
resource
.
getRelativeUrl
(),)
self
.
assertEqual
(
'product_module/4'
,
resource
.
getRelativeUrl
())
self
.
tic
()
self
.
tic
()
packing_list
=
self
.
createPackingList
(
resource
=
resource
,
organisation
=
organisation
)
packing_list
=
self
.
createPackingList
(
resource
=
resource
,
organisation
=
organisation
)
...
@@ -629,7 +624,7 @@ class TestItem(TestItemMixin, ERP5TypeTestCase):
...
@@ -629,7 +624,7 @@ class TestItem(TestItemMixin, ERP5TypeTestCase):
'title'
:
'Lot A10'
,
'title'
:
'Lot A10'
,
'reference'
:
'1070110000015'
,
'reference'
:
'1070110000015'
,
'quantity'
:
20.0
,
'quantity'
:
20.0
,
'line_variation_category_list'
:
'size/product_module/4
/3'
'line_variation_category_list'
:
size_base
+
'
/3'
},
},
)
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment