Fix testLegacySimulationPerformance

Even if not required for the test, the change to
test_advanced_sale_invoice_trade_model_builder preferable.

bt5/erp5_simulation_performance_test/PathTemplateItem/business_process_module/test_bp.xml

@@ -104,10 +104,6 @@
             <key> <string>id</string> </key>
             <value> <string>test_bp</string> </value>
         </item>
-        <item>
-            <key> <string>last_id</string> </key>
-            <value> <string>9</string> </value>
-        </item>
         <item>
             <key> <string>portal_type</string> </key>
             <value> <string>Business Process</string> </value>

bt5/erp5_simulation_performance_test/PathTemplateItem/portal_categories/base_amount/tax.xml

@@ -101,10 +101,6 @@
             <key> <string>int_index</string> </key>
             <value> <int>1</int> </value>
         </item>
-        <item>
-            <key> <string>last_id</string> </key>
-            <value> <string>2</string> </value>
-        </item>
         <item>
             <key> <string>portal_type</string> </key>
             <value> <string>Category</string> </value>

bt5/erp5_simulation_performance_test/PathTemplateItem/portal_categories/quantity_unit/unit.xml

@@ -93,10 +93,6 @@
             <key> <string>int_index</string> </key>
             <value> <int>1</int> </value>
         </item>
-        <item>
-            <key> <string>last_id</string> </key>
-            <value> <string>1</string> </value>
-        </item>
         <item>
             <key> <string>portal_type</string> </key>
             <value> <string>Category</string> </value>

bt5/erp5_simulation_performance_test/PathTemplateItem/portal_deliveries/test_advanced_sale_invoice_builder.xml

@@ -73,10 +73,6 @@
             <key> <string>id</string> </key>
             <value> <string>test_advanced_sale_invoice_builder</string> </value>
         </item>
-        <item>
-            <key> <string>last_id</string> </key>
-            <value> <string>1</string> </value>
-        </item>
         <item>
             <key> <string>portal_type</string> </key>
             <value> <string>Delivery Builder</string> </value>

bt5/erp5_simulation_performance_test/PathTemplateItem/portal_deliveries/test_advanced_sale_invoice_trade_model_builder.xml

@@ -44,8 +44,7 @@
             <key> <string>delivery_cell_separate_order</string> </key>
             <value>
               <tuple>
-                <string>calculateAveragePrice</string>
-                <string>calculateAddQuantity</string>
+                <string>calculateSeparatePrice</string>
               </tuple>
             </value>
         </item>
@@ -75,10 +74,6 @@
             <key> <string>id</string> </key>
             <value> <string>test_advanced_sale_invoice_trade_model_builder</string> </value>
         </item>
-        <item>
-            <key> <string>last_id</string> </key>
-            <value> <string>2</string> </value>
-        </item>
         <item>
             <key> <string>portal_type</string> </key>
             <value> <string>Delivery Builder</string> </value>

bt5/erp5_simulation_performance_test/PathTemplateItem/portal_deliveries/test_sale_packing_list_builder.xml

@@ -73,10 +73,6 @@
             <key> <string>id</string> </key>
             <value> <string>test_sale_packing_list_builder</string> </value>
         </item>
-        <item>
-            <key> <string>last_id</string> </key>
-            <value> <string>1</string> </value>
-        </item>
         <item>
             <key> <string>portal_type</string> </key>
             <value> <string>Delivery Builder</string> </value>

bt5/erp5_simulation_performance_test/PathTemplateItem/portal_rules/test_trade_model_rule.xml

@@ -153,10 +153,6 @@
             <key> <string>id</string> </key>
             <value> <string>test_trade_model_rule</string> </value>
         </item>
-        <item>
-            <key> <string>last_id</string> </key>
-            <value> <string>3</string> </value>
-        </item>
         <item>
             <key> <string>matching_property</string> </key>
             <value>

bt5/erp5_simulation_performance_test/PathTemplateItem/sale_trade_condition_module/test_stc.xml

@@ -123,10 +123,6 @@
             <key> <string>id</string> </key>
             <value> <string>test_stc</string> </value>
         </item>
-        <item>
-            <key> <string>last_id</string> </key>
-            <value> <string>2</string> </value>
-        </item>
         <item>
             <key> <string>portal_type</string> </key>
             <value> <string>Sale Trade Condition</string> </value>

bt5/erp5_simulation_performance_test/SkinTemplateItem/portal_skins/erp5_simulation_performance_test.xml

@@ -31,7 +31,7 @@
         </item>
         <item>
             <key> <string>business_template_skin_layer_priority</string> </key>
-            <value> <float>10.0</float> </value>
+            <value> <float>40.0</float> </value>
         </item>
         <item>
             <key> <string>id</string> </key>

bt5/erp5_simulation_performance_test/bt/revision

-22
+23
\ No newline at end of file

product/ERP5Legacy/tests/testLegacySimulationPerformance.py

@@ -121,13 +121,10 @@ class TestSimulationPerformance(ERP5TypeTestCase, LogInterceptor):
       """
         Return the list of business templates.
       """
-      return ('erp5_base',
-              'erp5_pdm',
-              'erp5_trade', 
-              'erp5_invoicing',
-              'erp5_accounting',
-              'erp5_advanced_invoicing',
-              'erp5_simulation_performance_test',)
+      return ('erp5_core_proxy_field_legacy', 'erp5_base',
+              'erp5_pdm', 'erp5_simulation', 'erp5_trade',
+              'erp5_accounting', 'erp5_invoicing', 'erp5_advanced_invoicing',
+              'erp5_simulation_test', 'erp5_simulation_performance_test')
 
     def afterSetUp(self):
       """
@@ -794,6 +791,9 @@ class TestSimulationPerformance(ERP5TypeTestCase, LogInterceptor):
               number_of_additional_sale_packing_list_lines=5,
               measurable=True)
 
+from Products.ERP5Legacy.tests import Legacy_getBusinessTemplateList
+Legacy_getBusinessTemplateList(TestSimulationPerformance)
+
 def test_suite():
   suite = unittest.TestSuite()
   suite.addTest(unittest.makeSuite(TestSimulationPerformance))