From a8ee940e388ddfd8cde0477203656674ca1ef424 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@odoo.com>
Date: Wed, 10 Oct 2018 16:56:07 +0000
Subject: [PATCH] [REM] core: assert, ir_set and url tags from XML data files

* ir_set and url were accepted by the RNG despite ir_set having been
  removed back in 2015 or so and <url> having possibly never existed in
  the first place (could not find any reference to an <url> element
  outside of sitemap qweb templates)
* <assert> was essentially deprecated/removed in 2015 with the v9
  accounting having stopped running account_assert_test.xml, which was
  the last file using the tag so far as I can tell. The file itself
  remained as dead code until 2018
---
 odoo/import_xml.rng   | 44 --------------------------------
 odoo/tools/convert.py | 59 -------------------------------------------
 2 files changed, 103 deletions(-)

diff --git a/odoo/import_xml.rng b/odoo/import_xml.rng
index ccc75af1665..244227ac239 100644
--- a/odoo/import_xml.rng
+++ b/odoo/import_xml.rng
@@ -235,47 +235,6 @@
         </rng:element>
     </rng:define>
 
-    <!-- TODO: remove these, useless -->
-
-    <rng:define name="assert">
-        <rng:element name="assert">
-            <rng:attribute name="model" />
-            <rng:optional><rng:attribute name="search" /></rng:optional>
-            <rng:optional><rng:attribute name="count" /></rng:optional>
-            <rng:optional><rng:attribute name="string" /></rng:optional>
-            <rng:optional><rng:attribute name="id" /></rng:optional>
-            <rng:optional><rng:attribute name="context" /></rng:optional>
-            <rng:optional><rng:attribute name="severity" /></rng:optional>
-            <rng:zeroOrMore>
-                <rng:element name="test">
-                    <rng:attribute name="expr"/>
-                    <rng:choice>
-                        <rng:text />
-                        <rng:empty />
-                    </rng:choice>
-                </rng:element>
-            </rng:zeroOrMore>
-        </rng:element>
-    </rng:define>
-
-    <rng:define name="ir_set">
-        <rng:element name="ir_set">
-            <rng:oneOrMore>
-                <rng:ref name="field" />
-            </rng:oneOrMore>
-        </rng:element>
-    </rng:define>
-
-    <rng:define name="url">
-        <rng:element name="url">
-            <rng:attribute name="id" />
-            <rng:attribute name="name" />
-            <rng:attribute name="url" />
-            <rng:optional><rng:attribute name="target" /></rng:optional>
-            <rng:empty />
-        </rng:element>
-    </rng:define>
-
     <rng:define name="act_window">
         <rng:element name="act_window">
             <rng:attribute name="id" />
@@ -316,11 +275,8 @@
                     <rng:ref name="template" />
                     <rng:ref name="delete" />
                     <rng:ref name="act_window" />
-                    <rng:ref name="url" />
-                    <rng:ref name="assert" />
                     <rng:ref name="report" />
                     <rng:ref name="function" />
-                    <rng:ref name="ir_set" />
                 </rng:choice>
             </rng:zeroOrMore>
         </rng:element>
diff --git a/odoo/tools/convert.py b/odoo/tools/convert.py
index f34bfe77015..1f909d74f28 100644
--- a/odoo/tools/convert.py
+++ b/odoo/tools/convert.py
@@ -491,64 +491,6 @@ form: module.record_id""" % (xml_id,)
         }
         self.env['ir.ui.menu']._load_records([data], self.mode == 'update')
 
-    def _assert_equals(self, f1, f2, prec=4):
-        return not round(f1 - f2, prec)
-
-    def _tag_assert(self, rec):
-        if self.noupdate and self.mode != 'init':
-            return
-
-        rec_model = rec.get("model")
-        rec_id = rec.get("id")
-        self._test_xml_id(rec_id)
-        rec_src = rec.get("search")
-        rec_src_count = rec.get("count")
-
-        rec_string = rec.get("string") or 'unknown'
-
-        records = None
-        env = self.get_env(rec)
-        if rec_id:
-            records = env[rec_model].browse(self.id_get(rec_id))
-        elif rec_src:
-            q = safe_eval(rec_src, {'ref': self.id_get})
-            records = env[rec_model].search(q)
-            if rec_src_count:
-                count = int(rec_src_count)
-                if len(records) != count:
-                    self.assertion_report.record_failure()
-                    msg = 'assertion "%s" failed!\n'    \
-                          ' Incorrect search count:\n'  \
-                          ' expected count: %d\n'       \
-                          ' obtained count: %d\n'       \
-                          % (rec_string, count, len(records))
-                    _logger.error(msg)
-                    return
-
-        assert records is not None,\
-            'You must give either an id or a search criteria'
-        ref = self.id_get
-        for record in records:
-            globals_dict = RecordDictWrapper(record)
-            globals_dict['floatEqual'] = self._assert_equals
-            globals_dict['ref'] = ref
-            globals_dict['_ref'] = ref
-            for test in rec.findall('./test'):
-                f_expr = test.get("expr",'')
-                expected_value = _eval_xml(self, test, env) or True
-                expression_value = safe_eval(f_expr, globals_dict)
-                if expression_value != expected_value: # assertion failed
-                    self.assertion_report.record_failure()
-                    msg = 'assertion "%s" failed!\n'    \
-                          ' xmltag: %s\n'               \
-                          ' expected value: %r\n'       \
-                          ' obtained value: %r\n'       \
-                          % (rec_string, etree.tostring(test, encoding='unicode'), expected_value, expression_value)
-                    _logger.error(msg)
-                    return
-        else: # all tests were successful for this assertion tag (no break)
-            self.assertion_report.record_success()
-
     def _tag_record(self, rec):
         rec_model = rec.get("model")
         env = self.get_env(rec)
@@ -755,7 +697,6 @@ form: module.record_id""" % (xml_id,)
             'template': self._tag_template,
             'report': self._tag_report,
             'act_window': self._tag_act_window,
-            'assert': self._tag_assert,
 
             **dict.fromkeys(self.DATA_ROOTS, self._tag_root)
         }