Finishing release 0.2

Author: htgoebel

CHANGES.rst

@@ -1,6 +1,17 @@
 Changelog
 ============
 
+v0.2 (2015-10-20)
+---------------------
+
+* Add support assertRegex/assertRegexpMatches, assertNotRegex
+  assertRaisesRegex/assertRaisesRegexp assertWarnsRegex.
+
+* `unittest2pytest` is now a `pytest` subproject.
+
+* Minor fixes.
+
+
 v0.1 (2015-10-16)
 ---------------------
 

README.rst

@@ -7,23 +7,24 @@ Helps converting unittest test-cases to pytest
 -----------------------------------------------------
 
 :Author:    Hartmut Goebel <[email protected]>
-:Version:   Version 0.1
+:Version:   Version 0.2
 :Copyright: Hartmut Goebel
 :Licence:   GNU Public Licence v3 or later (GPLv3+)
-:Homepage:  https://github.com/htgoebel/unittest2pytest
+:Homepage:  https://github.com/pytest-dev/unittest2pytest
 
 
-.. image:: https://secure.travis-ci.org/htgoebel/unittest2pytest.png?branch=master
-   :target: https://travis-ci.org/htgoebel/unittest2pytest/
+.. image:: https://secure.travis-ci.org/pytest-dev/unittest2pytest.png?branch=master
+   :target: https://travis-ci.org/pytest-dev/unittest2pytest/
 
 
 `unittest2pytest` is a tool that helps rewriting Python `unittest`
 test-cases into pytest_ test-cases.
 
 In contrast to other similar tools, this `unittest2pytest`
-- handles keyword arguments,
-- handles single-line test-cases and several tests on one line,
-- uses context-handlers where appropriate.
+
+* handles keyword arguments,
+* handles single-line test-cases and several tests on one line,
+* uses context-handlers where appropriate.
 
 This is done by using ``lib2to3`` and Python's mighty ``inspect``
 module.

setup.py

@@ -43,7 +43,7 @@ def read(filename):
     long_description=long_description,
     author="Hartmut Goebel",
     author_email="[email protected]",
-    url="https://github.com/htgoebel/unittest2pytest",
+    url="https://github.com/pytest-dev/unittest2pytest",
     packages=["unittest2pytest", "unittest2pytest.fixes"],
     entry_points={
         'console_scripts': [

tests/fixtures/self_assert/assertNotRegex_in.py

@@ -0,0 +1,15 @@
+# required-method: assertNotRegex
+
+class TestAssertEqual(TestCase):
+    def test_you(self):
+        self.assertNotRegex(abc, 'xxx')
+
+    def test_me(self):
+        self.assertNotRegex(123, xxx+y)
+
+    def test_everybody(self):
+        self.assertNotRegex(   'abc'   ,    'def'   )
+
+    def test_message(self):
+        self.assertNotRegex(123+z, xxx+y, msg='This is wrong!')
+        self.assertNotRegex(123, xxx+y, 'This is wrong!')

tests/fixtures/self_assert/assertNotRegex_out.py

@@ -0,0 +1,15 @@
+# required-method: assertNotRegex
+
+class TestAssertEqual(TestCase):
+    def test_you(self):
+        assert not re.search('xxx', abc)
+
+    def test_me(self):
+        assert not re.search(xxx+y, 123)
+
+    def test_everybody(self):
+        assert not re.search('def', 'abc')
+
+    def test_message(self):
+        assert not re.search(xxx+y, 123+z), 'This is wrong!'
+        assert not re.search(xxx+y, 123), 'This is wrong!'

tests/fixtures/self_assert/assertRaisesRegex_in.py

@@ -0,0 +1,14 @@
+# required-method: assertRaisesRegex
+
+class TestRaises(TestCase):
+    def test_simple(self):
+        self.assertRaisesRegex(RunTimeError, pattern, someFunc)
+
+    def test_args(self):
+        self.assertRaisesRegex(RunTimeError, pattern, someFunc, 1,2,3)
+
+    def test_kwargs(self):
+        self.assertRaisesRegex(RunTimeError, pattern, someFunc, foo=42, bar=43)
+
+    def test_args_kwargs(self):
+        self.assertRaisesRegex(RunTimeError, pattern, someFunc, 1,2,3, foo=42, bar=43)

tests/fixtures/self_assert/assertRaisesRegex_out.py

@@ -0,0 +1,22 @@
+# required-method: assertRaisesRegex
+
+class TestRaises(TestCase):
+    def test_simple(self):
+        with pytest.raises(RunTimeError) as excinfo:
+            someFunc()
+        assert re.search(pattern, excinfo.value)
+
+    def test_args(self):
+        with pytest.raises(RunTimeError) as excinfo:
+            someFunc(1,2,3)
+        assert re.search(pattern, excinfo.value)
+
+    def test_kwargs(self):
+        with pytest.raises(RunTimeError) as excinfo:
+            someFunc(foo=42, bar=43)
+        assert re.search(pattern, excinfo.value)
+
+    def test_args_kwargs(self):
+        with pytest.raises(RunTimeError) as excinfo:
+            someFunc(1,2,3, foo=42, bar=43)
+        assert re.search(pattern, excinfo.value)

tests/fixtures/self_assert/assertRaisesRegexp_in.py

@@ -0,0 +1,14 @@
+# required-method: assertRaisesRegexp
+
+class TestRaises(TestCase):
+    def test_simple(self):
+        self.assertRaisesRegexp(RunTimeError, pattern, someFunc)
+
+    def test_args(self):
+        self.assertRaisesRegexp(RunTimeError, pattern, someFunc, 1,2,3)
+
+    def test_kwargs(self):
+        self.assertRaisesRegexp(RunTimeError, pattern, someFunc, foo=42, bar=43)
+
+    def test_args_kwargs(self):
+        self.assertRaisesRegexp(RunTimeError, pattern, someFunc, 1,2,3, foo=42, bar=43)

tests/fixtures/self_assert/assertRaisesRegexp_out.py

@@ -0,0 +1,22 @@
+# required-method: assertRaisesRegexp
+
+class TestRaises(TestCase):
+    def test_simple(self):
+        with pytest.raises(RunTimeError) as excinfo:
+            someFunc()
+        assert re.search(pattern, excinfo.value)
+
+    def test_args(self):
+        with pytest.raises(RunTimeError) as excinfo:
+            someFunc(1,2,3)
+        assert re.search(pattern, excinfo.value)
+
+    def test_kwargs(self):
+        with pytest.raises(RunTimeError) as excinfo:
+            someFunc(foo=42, bar=43)
+        assert re.search(pattern, excinfo.value)
+
+    def test_args_kwargs(self):
+        with pytest.raises(RunTimeError) as excinfo:
+            someFunc(1,2,3, foo=42, bar=43)
+        assert re.search(pattern, excinfo.value)

tests/fixtures/self_assert/assertRegex_in.py

@@ -0,0 +1,15 @@
+# required-method: assertRegex
+
+class TestAssertEqual(TestCase):
+    def test_you(self):
+        self.assertRegex(abc, 'xxx')
+
+    def test_me(self):
+        self.assertRegex(123, xxx+y)
+
+    def test_everybody(self):
+        self.assertRegex(   'abc'   ,    'def'   )
+
+    def test_message(self):
+        self.assertRegex(123+z, xxx+y, msg='This is wrong!')
+        self.assertRegex(123, xxx+y, 'This is wrong!')