From bee0991528b29c8098e400c3a73895eb73b5dee4 Mon Sep 17 00:00:00 2001
From: Yannick Tivisse <yti@odoo.com>
Date: Mon, 4 Nov 2019 16:47:29 +0100
Subject: [IMP] test_mail: Adapt tests to work with/without demo data

---
 addons/test_mail/data/demo.xml          | 30 ----------------------------
 addons/test_mail/data/subtype_data.xml  | 35 +++++++++++++++++++++++++++++++++
 addons/test_mail/data/subtype_demo.xml  | 35 ---------------------------------
 addons/test_mail/data/template_data.xml | 24 ++++++++++++++++++++++
 addons/test_mail/data/template_demo.xml | 24 ----------------------
 5 files changed, 59 insertions(+), 89 deletions(-)
 delete mode 100644 addons/test_mail/data/demo.xml
 create mode 100644 addons/test_mail/data/subtype_data.xml
 delete mode 100644 addons/test_mail/data/subtype_demo.xml
 create mode 100644 addons/test_mail/data/template_data.xml
 delete mode 100644 addons/test_mail/data/template_demo.xml

(limited to 'addons/test_mail/data')

diff --git a/addons/test_mail/data/demo.xml b/addons/test_mail/data/demo.xml
deleted file mode 100644
index 552d20d439d..00000000000
--- a/addons/test_mail/data/demo.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-    <record id="object5" model="test_performance.mail">
-        <field name="name">Object 0</field>
-        <field name="value">0</field>
-        <field name="partner_id" ref="base.res_partner_3"/>
-    </record>
-    <record id="object6" model="test_performance.mail">
-        <field name="name">Object 1</field>
-        <field name="value">10</field>
-        <field name="partner_id" ref="base.res_partner_3"/>
-    </record>
-    <record id="object7" model="test_performance.mail">
-        <field name="name">Object 2</field>
-        <field name="value">20</field>
-        <field name="partner_id" ref="base.res_partner_4"/>
-    </record>
-    <record id="object8" model="test_performance.mail">
-        <field name="name">Object 3</field>
-        <field name="value">30</field>
-        <field name="partner_id" ref="base.res_partner_10"/>
-    </record>
-    <record id="object9" model="test_performance.mail">
-        <field name="name">Object 4</field>
-        <field name="value">40</field>
-        <field name="partner_id" ref="base.res_partner_12"/>
-    </record>
-
-</odoo>
diff --git a/addons/test_mail/data/subtype_data.xml b/addons/test_mail/data/subtype_data.xml
new file mode 100644
index 00000000000..076f4cbbf9b
--- /dev/null
+++ b/addons/test_mail/data/subtype_data.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="st_mail_test_simple_external" model="mail.message.subtype">
+        <field name="name">External subtype</field>
+        <field name="description">External subtype</field>
+        <field name="res_model">mail.test.simple</field>
+        <field name="default" eval="False"/>
+        <field name="internal" eval="False"/>
+    </record>
+
+    <record id="st_mail_test_full_umbrella_upd" model="mail.message.subtype">
+        <field name="name">Umbrella Changed Subtype</field>
+        <field name="description">Umbrella Changed</field>
+        <field name="res_model">mail.test.full</field>
+        <field name="default" eval="True"/>
+        <field name="internal" eval="False"/>
+    </record>
+
+    <record id="st_mail_test_default" model="mail.message.subtype">
+        <field name="name">Umbrella Default Subtype</field>
+        <field name="res_model">mail.test</field>
+        <field name="default" eval="True"/>
+        <field name="internal" eval="False"/>
+    </record>
+    <!-- when subscribing to mail.test umbrella, delegate to mail.test.full child -->
+    <record id="st_mail_test_child_full" model="mail.message.subtype">
+        <field name="name">Umbrella Child Full Subtype</field>
+        <field name="res_model">mail.test</field>
+        <field name="parent_id" eval="ref('test_mail.st_mail_test_full_umbrella_upd')"/>
+        <field name="relation_field">umbrella_id</field>
+        <field name="default" eval="False"/>
+        <field name="internal" eval="False"/>
+    </record>
+</odoo>
diff --git a/addons/test_mail/data/subtype_demo.xml b/addons/test_mail/data/subtype_demo.xml
deleted file mode 100644
index 076f4cbbf9b..00000000000
--- a/addons/test_mail/data/subtype_demo.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-    <record id="st_mail_test_simple_external" model="mail.message.subtype">
-        <field name="name">External subtype</field>
-        <field name="description">External subtype</field>
-        <field name="res_model">mail.test.simple</field>
-        <field name="default" eval="False"/>
-        <field name="internal" eval="False"/>
-    </record>
-
-    <record id="st_mail_test_full_umbrella_upd" model="mail.message.subtype">
-        <field name="name">Umbrella Changed Subtype</field>
-        <field name="description">Umbrella Changed</field>
-        <field name="res_model">mail.test.full</field>
-        <field name="default" eval="True"/>
-        <field name="internal" eval="False"/>
-    </record>
-
-    <record id="st_mail_test_default" model="mail.message.subtype">
-        <field name="name">Umbrella Default Subtype</field>
-        <field name="res_model">mail.test</field>
-        <field name="default" eval="True"/>
-        <field name="internal" eval="False"/>
-    </record>
-    <!-- when subscribing to mail.test umbrella, delegate to mail.test.full child -->
-    <record id="st_mail_test_child_full" model="mail.message.subtype">
-        <field name="name">Umbrella Child Full Subtype</field>
-        <field name="res_model">mail.test</field>
-        <field name="parent_id" eval="ref('test_mail.st_mail_test_full_umbrella_upd')"/>
-        <field name="relation_field">umbrella_id</field>
-        <field name="default" eval="False"/>
-        <field name="internal" eval="False"/>
-    </record>
-</odoo>
diff --git a/addons/test_mail/data/template_data.xml b/addons/test_mail/data/template_data.xml
new file mode 100644
index 00000000000..35bdbedd7a2
--- /dev/null
+++ b/addons/test_mail/data/template_data.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="mail_test_full_tracking_tpl" model="mail.template">
+        <field name="name">Mail Test Full: Tracking Template</field>
+        <field name="subject">Test Template</field>
+        <field name="partner_to">${object.customer_id.id | safe}</field>
+        <field name="body_html" type="xml"><p>Hello ${object.name}</p></field>
+        <field name="model_id" ref="test_mail.model_mail_test_full"/>
+        <field name="auto_delete" eval="True"/>
+    </record>
+
+    <record id="mail_test_tpl" model="mail.template">
+        <field name="name">Mail Test: Template</field>
+        <field name="subject">Post on ${object.name}</field>
+        <field name="partner_to">${object.customer_id.id}</field>
+        <field name="body_html" type="xml"><p>Adding stuff on ${object.name}</p></field>
+        <field name="model_id" ref="test_mail.model_mail_test"/>
+        <field name="auto_delete" eval="True"/>
+    </record>
+
+    <template id="mail_test_full_tracking_view">
+    	<p><span t-esc="object.name"/> datetime has been updated to <span t-esc="object.datetime"/></p>
+    </template>
+</odoo>
diff --git a/addons/test_mail/data/template_demo.xml b/addons/test_mail/data/template_demo.xml
deleted file mode 100644
index 35bdbedd7a2..00000000000
--- a/addons/test_mail/data/template_demo.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <record id="mail_test_full_tracking_tpl" model="mail.template">
-        <field name="name">Mail Test Full: Tracking Template</field>
-        <field name="subject">Test Template</field>
-        <field name="partner_to">${object.customer_id.id | safe}</field>
-        <field name="body_html" type="xml"><p>Hello ${object.name}</p></field>
-        <field name="model_id" ref="test_mail.model_mail_test_full"/>
-        <field name="auto_delete" eval="True"/>
-    </record>
-
-    <record id="mail_test_tpl" model="mail.template">
-        <field name="name">Mail Test: Template</field>
-        <field name="subject">Post on ${object.name}</field>
-        <field name="partner_to">${object.customer_id.id}</field>
-        <field name="body_html" type="xml"><p>Adding stuff on ${object.name}</p></field>
-        <field name="model_id" ref="test_mail.model_mail_test"/>
-        <field name="auto_delete" eval="True"/>
-    </record>
-
-    <template id="mail_test_full_tracking_view">
-    	<p><span t-esc="object.name"/> datetime has been updated to <span t-esc="object.datetime"/></p>
-    </template>
-</odoo>
-- 
cgit v1.2.3