expand tests

Author: Sergey Chipiga

pytest_ordering/__init__.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-__author__ = '[email protected]'
-
 import pytest
 
 orders_map = {
@@ -57,7 +55,7 @@ def pytest_collection_modifyitems(session, config, items):
         grouped_items.setdefault(order, []).append(item)
 
     if grouped_items:
-        unordered_items = grouped_items.pop(None) if None in grouped_items else None
+        unordered_items = grouped_items.pop(None, None)
 
         sorted_items = []
         prev_key = 0

pytest_ordering/author.py

@@ -0,0 +1,2 @@
+__author__ = '[email protected] <Frank Tobia>, ' \
+             '[email protected] <Sergei Chipiga>'

pytest_ordering/version.py

@@ -1 +1 @@
-__version__ = '1.0'
+__version__ = '0.4'

setup.py

@@ -26,7 +26,7 @@
     },
     install_requires=['pytest'],
     classifiers=[
-        'Development Status :: Stable',
+        'Development Status :: 4 - Beta',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Operating System :: POSIX',

tests/test_ordering.py

@@ -1,8 +1,10 @@
 # -*- coding: utf-8 -*-
 
-__author__ = "[email protected]"
+import re
 
 import pytest
+import pytest_ordering.author
+import pytest_ordering.version
 
 pytest_plugins = ["pytester"]
 
@@ -28,7 +30,7 @@ def test_1(): pass
     def test_2(): pass
     """
 
-    assert ['test_1', 'test_2'] == item_names_for(tests_content)
+    assert item_names_for(tests_content) == ['test_1', 'test_2']
 
 
 def test_first_mark(item_names_for):
@@ -41,7 +43,7 @@ def test_1(): pass
     def test_2(): pass
     """
 
-    assert ['test_2', 'test_1'] == item_names_for(tests_content)
+    assert item_names_for(tests_content) == ['test_2', 'test_1']
 
 
 def test_last_mark(item_names_for):
@@ -54,7 +56,7 @@ def test_1(): pass
     def test_2(): pass
     """
 
-    assert ['test_2', 'test_1'] == item_names_for(tests_content)
+    assert item_names_for(tests_content) == ['test_2', 'test_1']
 
 
 def test_first_last_marks(item_names_for):
@@ -70,4 +72,127 @@ def test_2(): pass
     def test_3(): pass
     """
 
-    assert ['test_2', 'test_3', 'test_1'] == item_names_for(tests_content)
+    assert item_names_for(tests_content) == ['test_2', 'test_3', 'test_1']
+
+
+def test_order_marks(item_names_for):
+    tests_content = """
+    import pytest
+
+    @pytest.mark.run(order=-1)
+    def test_1(): pass
+
+    @pytest.mark.run(order=-2)
+    def test_2(): pass
+
+    @pytest.mark.run(order=1)
+    def test_3(): pass
+    """
+
+    assert item_names_for(tests_content) == ['test_3', 'test_2', 'test_1']
+
+
+def test_first_mark_class(item_names_for):
+    tests_content = """
+    import pytest
+
+    def test_1(): pass
+
+
+    @pytest.mark.first
+    class TestSuite(object):
+
+        def test_3(self): pass
+
+        def test_2(self): pass
+
+    """
+
+    assert item_names_for(tests_content) == ['test_3', 'test_2', 'test_1']
+
+
+def test_last_mark_class(item_names_for):
+    tests_content = """
+    import pytest
+
+    @pytest.mark.last
+    class TestSuite(object):
+
+        def test_1(self): pass
+
+        def test_2(self): pass
+
+
+    def test_3(): pass
+    """
+
+    assert item_names_for(tests_content) == ['test_3', 'test_1', 'test_2']
+
+
+def test_first_last_mark_class(item_names_for):
+    tests_content = """
+    import pytest
+
+    @pytest.mark.last
+    class TestLast(object):
+
+        def test_1(self): pass
+
+        def test_2(self): pass
+
+
+    def test_3(): pass
+
+
+    @pytest.mark.first
+    class TestFirst(object):
+
+        def test_4(self): pass
+
+        def test_5(self): pass
+
+    """
+
+    assert item_names_for(tests_content) == ['test_4', 'test_5', 'test_3', 'test_1', 'test_2']
+
+
+def test_order_mark_class(item_names_for):
+    tests_content = """
+    import pytest
+
+    @pytest.mark.run(order=-1)
+    class TestLast(object):
+
+        def test_1(self): pass
+
+        def test_2(self): pass
+
+
+    @pytest.mark.run(order=0)
+    def test_3(): pass
+
+
+    @pytest.mark.run(order=-2)
+    class TestFirst(object):
+
+        def test_4(self): pass
+
+        def test_5(self): pass
+    """
+
+    assert item_names_for(tests_content) == ['test_3', 'test_4', 'test_5', 'test_1', 'test_2']
+
+
+def test_run_marker_registered(capsys):
+    pytest.main('--markers')
+    out, err = capsys.readouterr()
+    assert '@pytest.mark.run' in out
+
+
+def test_version_valid():
+    assert re.match(r'[0-9]+\.[0-9]+(\.[0-9]+)?$',
+                    pytest_ordering.version.__version__)
+
+
+def test_author_present():
+    assert hasattr(pytest_ordering.author, '__author__')