From 503a133476ce19eb6ba36a57d8b2fe88a78a1753 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Taymans?= <remytaymans@gmail.com>
Date: Wed, 29 Apr 2020 19:04:48 +0200
Subject: [PATCH] [FIX] b_shift_attendance: Tests

---
 beesdoo_shift/__manifest__.py                 |  2 -
 beesdoo_shift/demo/cooperators.xml            | 84 -------------------
 beesdoo_shift/demo/templates.xml              | 39 ---------
 beesdoo_shift_attendance/__manifest__.py      |  3 +
 beesdoo_shift_attendance/demo/tasks.xml       | 46 ++++++++++
 .../demo/workers.xml                          | 12 +--
 .../tests/test_beesdoo_shift.py               | 21 +++--
 7 files changed, 67 insertions(+), 140 deletions(-)
 delete mode 100644 beesdoo_shift/demo/cooperators.xml
 create mode 100644 beesdoo_shift_attendance/demo/tasks.xml
 rename {beesdoo_shift => beesdoo_shift_attendance}/demo/workers.xml (78%)

diff --git a/beesdoo_shift/__manifest__.py b/beesdoo_shift/__manifest__.py
index 3205305..d56e5cf 100644
--- a/beesdoo_shift/__manifest__.py
+++ b/beesdoo_shift/__manifest__.py
@@ -38,8 +38,6 @@
         "wizard/temporary_exemption.xml",
     ],
     'demo': [
-        "demo/cooperators.xml",
-        "demo/workers.xml",
         "demo/templates.xml",
     ]
 }
diff --git a/beesdoo_shift/demo/cooperators.xml b/beesdoo_shift/demo/cooperators.xml
deleted file mode 100644
index 8f1ebfd..0000000
--- a/beesdoo_shift/demo/cooperators.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright 2019 Coop IT Easy
-     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
--->
-<odoo>
-    <record id="res_partner_cooperator_1_demo" model="res.partner">
-        <field name="name">Fernand Peso</field>
-        <field name="customer" eval="True"/>
-        <field name="is_company" eval="False"/>
-        <field name="email">fernand_peso@demo.net</field>
-        <field name="street">Avenue des Bas-de-Callanques, 15</field>
-        <field name="city">Etterbeek</field>
-        <field name="zip">1040</field>
-        <field name="country_id" ref="base.be"/>
-        <field name="working_mode">regular</field>
-        <field name="is_worker" eval="True" />
-    </record>
-
-    <record id="res_partner_cooperator_2_demo" model="res.partner">
-        <field name="name">Dupont Dupont</field>
-        <field name="customer" eval="True"/>
-        <field name="is_company" eval="False"/>
-        <field name="email">d_dupont@demo.net</field>
-        <field name="street">Rue des sables, 20</field>
-        <field name="city">Bruxelles</field>
-        <field name="zip">10000</field>
-        <field name="country_id" ref="base.be"/>
-        <field name="working_mode">irregular</field>
-        <field name="is_worker" eval="True" />
-    </record>
-
-    <record id="res_partner_cooperator_3_demo" model="res.partner">
-        <field name="name">Ronan Le Gall</field>
-        <field name="customer" eval="True"/>
-        <field name="is_company" eval="False"/>
-        <field name="email">ronan_gall@demo.net</field>
-        <field name="street">Rue des pecheurs, 23</field>
-        <field name="city">Landudec</field>
-        <field name="zip">29710</field>
-        <field name="country_id" ref="base.fr"/>
-        <field name="working_mode">regular</field>
-        <field name="is_worker" eval="True" />
-    </record>
-
-    <record id="res_partner_cooperator_4_demo" model="res.partner">
-        <field name="name">Elouan Bees</field>
-        <field name="customer" eval="True"/>
-        <field name="is_company" eval="False"/>
-        <field name="email">elouan_bees@demo.net</field>
-        <field name="street">Rue Wéry, 15</field>
-        <field name="city">Ixelles</field>
-        <field name="zip">1050</field>
-        <field name="country_id" ref="base.be"/>
-        <field name="working_mode">irregular</field>
-        <field name="is_worker" eval="True" />
-    </record>
-
-    <record id="res_partner_cooperator_5_demo" model="res.partner">
-        <field name="name">Anne de Marchalo</field>
-        <field name="customer" eval="True"/>
-        <field name="is_company" eval="False"/>
-        <field name="email">anne_marchalo@demo.net</field>
-        <field name="street">Rue du Wels, 6</field>
-        <field name="city">Nantes</field>
-        <field name="zip">44000</field>
-        <field name="country_id" ref="base.fr"/>
-        <field name="working_mode">regular</field>
-        <field name="is_worker" eval="True" />
-    </record>
-
-    <record id="res_partner_cooperator_6_demo" model="res.partner">
-        <field name="name">Jean Beaumont</field>
-        <field name="customer" eval="True"/>
-        <field name="is_company" eval="False"/>
-        <field name="email">jean_beaumont@demo.net</field>
-        <field name="street">Rue de la Jungle, 8</field>
-        <field name="city">St-Gilles</field>
-        <field name="zip">1060</field>
-        <field name="country_id" ref="base.be"/>
-        <field name="working_mode">regular</field>
-        <field name="is_worker" eval="True" />
-    </record>
-</odoo>
diff --git a/beesdoo_shift/demo/templates.xml b/beesdoo_shift/demo/templates.xml
index fd88cea..a78c101 100644
--- a/beesdoo_shift/demo/templates.xml
+++ b/beesdoo_shift/demo/templates.xml
@@ -65,43 +65,4 @@
         <field name="name">Semaine A</field>
     </record>
 
-    <record id="beesdoo_shift_task_template_1_demo" model="beesdoo.shift.template">
-        <field name="name">A_LUN_7:00-9:30</field>
-        <field name="planning_id" ref="beesdoo_shift_planning_1_demo" />
-        <field name="day_nb_id" ref="beesdoo_shift_daynumber_1_demo" />
-        <field name="task_type_id" ref="beesdoo_shift_task_type_3_demo" />
-        <field name="start_time">7</field>
-        <field name="end_time">9.5</field>
-        <field name="duration">2.5</field>
-        <field name="worker_nb">12</field>
-        <!-- WARNING: issue, worker not registered in demo -->
-        <field name="worker_ids" eval="[(6, 0, [ref('beesdoo_shift.res_partner_cooperator_1_demo')])]"/>
-    </record>
-
-    <record id="beesdoo_shift_task_template_2_demo" model="beesdoo.shift.template">
-        <field name="name">A_MAR_12:00-14:30</field>
-        <field name="planning_id" ref="beesdoo_shift_planning_1_demo" />
-        <field name="day_nb_id" ref="beesdoo_shift_daynumber_2_demo" />
-        <field name="task_type_id" ref="beesdoo_shift_task_type_2_demo" />
-        <field name="start_time">12</field>
-        <field name="end_time">14.5</field>
-        <field name="duration">2.5</field>
-        <field name="worker_nb">9</field>
-        <!-- WARNING: issue, worker not registered in demo -->
-        <field name="worker_ids" eval="[(6, 0, [ref('beesdoo_shift.res_partner_cooperator_3_demo')])]"/>
-    </record>
-
-    <record id="beesdoo_shift_task_template_3_demo" model="beesdoo.shift.template">
-        <field name="name">A_VEN_7:00-9:30</field>
-        <field name="planning_id" ref="beesdoo_shift_planning_1_demo" />
-        <field name="day_nb_id" ref="beesdoo_shift_daynumber_5_demo" />
-        <field name="task_type_id" ref="beesdoo_shift_task_type_1_demo" />
-        <field name="start_time">7</field>
-        <field name="end_time">9.5</field>
-        <field name="duration">2.5</field>
-        <field name="worker_nb">7</field>
-        <!-- WARNING: issue, worker not registered in demo -->
-        <field name="worker_ids" eval="[(6, 0, [ref('beesdoo_shift.res_partner_cooperator_6_demo')])]"/>
-    </record>
-
 </odoo>
diff --git a/beesdoo_shift_attendance/__manifest__.py b/beesdoo_shift_attendance/__manifest__.py
index 2b260c4..e40ec55 100644
--- a/beesdoo_shift_attendance/__manifest__.py
+++ b/beesdoo_shift_attendance/__manifest__.py
@@ -21,6 +21,7 @@
     'version': '12.0.1.0.0',
 
     'depends': [
+        'beesdoo_base',
         'beesdoo_shift',
         'beesdoo_worker_status',
         'mail',
@@ -39,6 +40,8 @@
         "views/attendance_sheet.xml",
     ],
     'demo': [
+        "demo/tasks.xml",
+        "demo/workers.xml",
         "demo/users.xml",
     ]
 }
diff --git a/beesdoo_shift_attendance/demo/tasks.xml b/beesdoo_shift_attendance/demo/tasks.xml
new file mode 100644
index 0000000..064a610
--- /dev/null
+++ b/beesdoo_shift_attendance/demo/tasks.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright 2019 Coop IT Easy
+     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+-->
+<odoo>
+
+    <record id="beesdoo_shift_attendance_task_template_1_demo" model="beesdoo.shift.template">
+        <field name="name">A_LUN_7:00-9:30</field>
+        <field name="planning_id" ref="beesdoo_shift.beesdoo_shift_planning_1_demo" />
+        <field name="day_nb_id" ref="beesdoo_shift.beesdoo_shift_daynumber_1_demo" />
+        <field name="task_type_id" ref="beesdoo_shift.beesdoo_shift_task_type_3_demo" />
+        <field name="start_time">7</field>
+        <field name="end_time">9.5</field>
+        <field name="duration">2.5</field>
+        <field name="worker_nb">12</field>
+        <field name="worker_ids" eval="[(6, 0, [ref('beesdoo_base.res_partner_cooperator_1_demo')])]"/>
+    </record>
+
+    <record id="beesdoo_shift_attendance_task_template_2_demo" model="beesdoo.shift.template">
+        <field name="name">A_MAR_12:00-14:30</field>
+        <field name="planning_id" ref="beesdoo_shift.beesdoo_shift_planning_1_demo" />
+        <field name="day_nb_id" ref="beesdoo_shift.beesdoo_shift_daynumber_2_demo" />
+        <field name="task_type_id" ref="beesdoo_shift.beesdoo_shift_task_type_2_demo" />
+        <field name="start_time">12</field>
+        <field name="end_time">14.5</field>
+        <field name="duration">2.5</field>
+        <field name="worker_nb">9</field>
+        <!-- WARNING: issue, worker not registered in demo -->
+        <field name="worker_ids" eval="[(6, 0, [ref('beesdoo_base.res_partner_cooperator_3_demo')])]"/>
+    </record>
+
+    <record id="beesdoo_shift_attendance_task_template_3_demo" model="beesdoo.shift.template">
+        <field name="name">A_VEN_7:00-9:30</field>
+        <field name="planning_id" ref="beesdoo_shift.beesdoo_shift_planning_1_demo" />
+        <field name="day_nb_id" ref="beesdoo_shift.beesdoo_shift_daynumber_5_demo" />
+        <field name="task_type_id" ref="beesdoo_shift.beesdoo_shift_task_type_1_demo" />
+        <field name="start_time">7</field>
+        <field name="end_time">9.5</field>
+        <field name="duration">2.5</field>
+        <field name="worker_nb">7</field>
+        <!-- WARNING: issue, worker not registered in demo -->
+        <field name="worker_ids" eval="[(6, 0, [ref('beesdoo_base.res_partner_cooperator_6_demo')])]"/>
+    </record>
+
+</odoo>
diff --git a/beesdoo_shift/demo/workers.xml b/beesdoo_shift_attendance/demo/workers.xml
similarity index 78%
rename from beesdoo_shift/demo/workers.xml
rename to beesdoo_shift_attendance/demo/workers.xml
index 989577b..c0684fc 100644
--- a/beesdoo_shift/demo/workers.xml
+++ b/beesdoo_shift_attendance/demo/workers.xml
@@ -5,7 +5,7 @@
 -->
 <odoo>
     <record id="beesdoo_shift_cooperative_status_1_demo" model="cooperative.status">
-        <field name="cooperator_id" ref="res_partner_cooperator_1_demo" />
+        <field name="cooperator_id" ref="beesdoo_base.res_partner_cooperator_1_demo" />
         <field name="info_session" eval="True" />
         <field name="info_session_date" eval="datetime.now() - timedelta(days=58)" />
         <field name="super" eval="True" />
@@ -14,7 +14,7 @@
     </record>
 
     <record id="beesdoo_shift_cooperative_status_2_demo" model="cooperative.status">
-        <field name="cooperator_id" ref="res_partner_cooperator_2_demo" />
+        <field name="cooperator_id" ref="beesdoo_base.res_partner_cooperator_2_demo" />
         <field name="info_session" eval="False" />
         <field name="sr">2</field>
         <field name="working_mode">irregular</field>
@@ -22,7 +22,7 @@
     </record>
 
     <record id="beesdoo_shift_cooperative_status_3_demo" model="cooperative.status">
-        <field name="cooperator_id" ref="res_partner_cooperator_3_demo" />
+        <field name="cooperator_id" ref="beesdoo_base.res_partner_cooperator_3_demo" />
         <field name="info_session" eval="True" />
         <field name="info_session_date" eval="datetime.now() - timedelta(days=98)" />
         <field name="sc">2</field>
@@ -30,20 +30,20 @@
     </record>
 
     <record id="beesdoo_shift_cooperative_status_4_demo" model="cooperative.status">
-        <field name="cooperator_id" ref="res_partner_cooperator_4_demo" />
+        <field name="cooperator_id" ref="beesdoo_base.res_partner_cooperator_4_demo" />
         <field name="sr">2</field>
         <field name="working_mode">irregular</field>
         <field name="irregular_start_date" eval="datetime.now() - timedelta(days=6)" />
     </record>
 
     <record id="beesdoo_shift_cooperative_status_5_demo" model="cooperative.status">
-        <field name="cooperator_id" ref="res_partner_cooperator_5_demo" />
+        <field name="cooperator_id" ref="beesdoo_base.res_partner_cooperator_5_demo" />
         <field name="sr">2</field>
         <field name="working_mode">regular</field>
     </record>
 
     <record id="beesdoo_shift_cooperative_status_6_demo" model="cooperative.status">
-        <field name="cooperator_id" ref="res_partner_cooperator_6_demo" />
+        <field name="cooperator_id" ref="beesdoo_base.res_partner_cooperator_6_demo" />
         <field name="info_session" eval="True" />
         <field name="info_session_date" eval="datetime.now() - timedelta(days=36)" />
         <field name="sc">2</field>
diff --git a/beesdoo_shift_attendance/tests/test_beesdoo_shift.py b/beesdoo_shift_attendance/tests/test_beesdoo_shift.py
index 030e62c..5ccca63 100644
--- a/beesdoo_shift_attendance/tests/test_beesdoo_shift.py
+++ b/beesdoo_shift_attendance/tests/test_beesdoo_shift.py
@@ -38,32 +38,35 @@ class TestBeesdooShift(TransactionCase):
         )
 
         self.worker_regular_1 = self.env.ref(
-            "beesdoo_shift.res_partner_cooperator_6_demo"
+            "beesdoo_base.res_partner_cooperator_6_demo"
         )
         self.worker_regular_2 = self.env.ref(
-            "beesdoo_shift.res_partner_cooperator_5_demo"
+            "beesdoo_base.res_partner_cooperator_5_demo"
         )
         self.worker_regular_3 = self.env.ref(
-            "beesdoo_shift.res_partner_cooperator_3_demo"
+            "beesdoo_base.res_partner_cooperator_3_demo"
         )
         self.worker_regular_super_1 = self.env.ref(
-            "beesdoo_shift.res_partner_cooperator_1_demo"
+            "beesdoo_base.res_partner_cooperator_1_demo"
         )
         self.worker_irregular_1 = self.env.ref(
-            "beesdoo_shift.res_partner_cooperator_2_demo"
+            "beesdoo_base.res_partner_cooperator_2_demo"
         )
         self.worker_irregular_2 = self.env.ref(
-            "beesdoo_shift.res_partner_cooperator_4_demo"
+            "beesdoo_base.res_partner_cooperator_4_demo"
         )
 
         self.task_type_1 = self.env.ref(
-            "beesdoo_shift.beesdoo_shift_task_type_1_demo"
+            "beesdoo_shift_attendance"
+            ".beesdoo_shift_attendance_task_type_1_demo"
         )
         self.task_type_2 = self.env.ref(
-            "beesdoo_shift.beesdoo_shift_task_type_2_demo"
+            "beesdoo_shift_attendance"
+            ".beesdoo_shift_attendance_task_type_2_demo"
         )
         self.task_type_3 = self.env.ref(
-            "beesdoo_shift.beesdoo_shift_task_type_3_demo"
+            "beesdoo_shift_attendance"
+            ".beesdoo_shift_attendance_task_type_3_demo"
         )
 
         self.task_template_1 = self.env.ref(