From 4938cec43d5ac136ee581015173abfe71af080cb Mon Sep 17 00:00:00 2001
From: Fabien BOURGEOIS <fabien@yaltik.com>
Date: Fri, 1 May 2020 18:44:24 +0200
Subject: [PATCH] [IMP]Yaltik DSL : tests, use asserRaises instead of try

---
 yaltik_dsl/test_xml_base.coco | 33 +++++++--------------------------
 yaltik_dsl/test_xml_base.py   | 35 ++++++++---------------------------
 2 files changed, 15 insertions(+), 53 deletions(-)

diff --git a/yaltik_dsl/test_xml_base.coco b/yaltik_dsl/test_xml_base.coco
index 814ffee..ad6db65 100644
--- a/yaltik_dsl/test_xml_base.coco
+++ b/yaltik_dsl/test_xml_base.coco
@@ -42,10 +42,8 @@ class TestXMLBase(unittest.TestCase):
     attrs = {'children': 'Some text'}
     (xmln <**| attrs |> getattr$(?, 'children') == ['Some text']) |> self.assertTrue
 
-    try:
+    with self.assertRaisesRegexp(TypeError, 'Invalid arguments'):
       xmln <**| {'children': False}
-    except TypeError as err:
-      ('Invalid arguments', err.message) |*> self.assertIn
 
 
   def test_xmlchild(self):
@@ -53,18 +51,11 @@ class TestXMLBase(unittest.TestCase):
     xmlc_par = xmlchild$ <| parent
 
     # Bad arguments
-    try:
+    with self.assertRaisesRegexp(TypeError, 'Invalid arguments for xmlchild'):
         xmlc_par <| False
-    except TypeError as err:
-        'Invalid arguments for xmlchild' `self.assertIn` err.message
-    try:
-        xmlc_par <| []
-    except TypeError as err:
-        'Invalid arguments for xmlchild' `self.assertIn` err.message
-    try: # Need XMLDictElement, not dict
+    # Need XMLDictElement, not dict
+    with self.assertRaisesRegexp(TypeError, 'Invalid arguments for xmlchild'):
         xmlc_par <| [{'tag': 't', 'attrs': {'a': 'b'}, 'children': []}]
-    except TypeError as err:
-        'Invalid arguments for xmlchild' `self.assertIn` err.message
 
     xmlc_par <| ['some text']
     parent.text `self.assertEquals` 'some text'
@@ -91,22 +82,12 @@ class TestXMLBase(unittest.TestCase):
     root = {'tag': 'root', 'attrs': {}, 'children': []} |> xmlroot
     isinstance <*| (root, ET.Element) |> self.assertTrue
 
-    try:
+    with self.assertRaisesRegexp(TypeError, 'has no attribute'):
       False |> xmlroot
-    except TypeError as err:
-      ('has no attribute', err.message) |*> self.assertIn
-    try:
+    with self.assertRaisesRegexp(KeyError, 'tag'):
       {} |> xmlroot
-    except KeyError as err:
-      ('tag', err.message) |*> self.assertIn
-    try:
+    with self.assertRaisesRegexp(KeyError, 'attrs'):
       {'tag': 'root'} |> xmlroot
-    except KeyError as err:
-      ('attrs', err.message) |*> self.assertIn
-    try:
-      {'tag': 'root', 'attrs': {}} |> xmlroot
-    except KeyError as err:
-      ('children', err.message) |*> self.assertIn
 
 
   def test_xml_write(self):
diff --git a/yaltik_dsl/test_xml_base.py b/yaltik_dsl/test_xml_base.py
index fb2f699..c84d9e8 100644
--- a/yaltik_dsl/test_xml_base.py
+++ b/yaltik_dsl/test_xml_base.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python2
 # -*- coding: utf-8 -*-
-# __coconut_hash__ = 0xb50857dd
+# __coconut_hash__ = 0xd35c4ffa
 
 # Compiled with Coconut version 1.4.3 [Ernest Scribbler]
 
@@ -68,10 +68,8 @@ class TestXMLBase(unittest.TestCase):
         attrs = {'children': 'Some text'}
         (self.assertTrue)(((_coconut_partial(getattr, {1: 'children'}, 2))((xmln)(**attrs)) == ['Some text']))
 
-        try:
+        with self.assertRaisesRegexp(TypeError, 'Invalid arguments'):
             (xmln)(**{'children': False})
-        except TypeError as err:
-            (self.assertIn)(*('Invalid arguments', err.message))
 
 
     def test_xmlchild(self):
@@ -79,18 +77,11 @@ class TestXMLBase(unittest.TestCase):
         xmlc_par = (_coconut.functools.partial(_coconut.functools.partial, xmlchild))(parent)
 
 # Bad arguments
-        try:
+        with self.assertRaisesRegexp(TypeError, 'Invalid arguments for xmlchild'):
             (xmlc_par)(False)
-        except TypeError as err:
-            (self.assertIn)('Invalid arguments for xmlchild', err.message)
-        try:
-            (xmlc_par)([])
-        except TypeError as err:
-            (self.assertIn)('Invalid arguments for xmlchild', err.message)
-        try:  # Need XMLDictElement, not dict
+# Need XMLDictElement, not dict
+        with self.assertRaisesRegexp(TypeError, 'Invalid arguments for xmlchild'):
             (xmlc_par)([{'tag': 't', 'attrs': {'a': 'b'}, 'children': []}])
-        except TypeError as err:
-            (self.assertIn)('Invalid arguments for xmlchild', err.message)
 
         (xmlc_par)(['some text'])
         (self.assertEquals)(parent.text, 'some text')
@@ -116,22 +107,12 @@ class TestXMLBase(unittest.TestCase):
         root = (xmlroot)({'tag': 'root', 'attrs': {}, 'children': []})
         (self.assertTrue)((isinstance)(*(root, ET.Element)))
 
-        try:
+        with self.assertRaisesRegexp(TypeError, 'has no attribute'):
             (xmlroot)(False)
-        except TypeError as err:
-            (self.assertIn)(*('has no attribute', err.message))
-        try:
+        with self.assertRaisesRegexp(KeyError, 'tag'):
             (xmlroot)({})
-        except KeyError as err:
-            (self.assertIn)(*('tag', err.message))
-        try:
+        with self.assertRaisesRegexp(KeyError, 'attrs'):
             (xmlroot)({'tag': 'root'})
-        except KeyError as err:
-            (self.assertIn)(*('attrs', err.message))
-        try:
-            (xmlroot)({'tag': 'root', 'attrs': {}})
-        except KeyError as err:
-            (self.assertIn)(*('children', err.message))
 
 
     def test_xml_write(self):