Merge pull request #4 from pomponchik/develop

0.0.4

Author: pomponchik

.github/workflows/tests_and_coverage.yml

@@ -33,7 +33,7 @@ jobs:
 
     - name: Run tests and show coverage on the command line
       run: |
-        coverage run --source=transfunctions --omit="*tests*" -m pytest --cache-clear --assert=plain && coverage report -m --fail-under=80
+        coverage run --source=transfunctions --omit="*tests*" -m pytest --cache-clear --assert=plain && coverage report -m --fail-under=90
         coverage xml
 
     - name: Upload coverage to Coveralls
@@ -46,4 +46,4 @@ jobs:
         file: coverage.xml
 
     - name: Run tests and show the branch coverage on the command line
-      run: coverage run --branch --source=transfunctions --omit="*tests*" -m pytest --cache-clear --assert=plain && coverage report -m --fail-under=80
+      run: coverage run --branch --source=transfunctions --omit="*tests*" -m pytest --cache-clear --assert=plain && coverage report -m --fail-under=90

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "transfunctions"
-version = "0.0.3"
+version = "0.0.4"
 authors = [
   { name="Evgeniy Blinov", email="zheni-b@yandex.ru" },
 ]

tests/units/decorators/test_superfunction.py

@@ -3,8 +3,9 @@
 from contextlib import redirect_stdout
 
 import pytest
+import full_match
 
-from transfunctions import superfunction, sync_context, async_context, generator_context
+from transfunctions import superfunction, sync_context, async_context, generator_context, await_it, WrongDecoratorSyntaxError
 
 """
 Что нужно проверить:
@@ -153,3 +154,97 @@ def function(a, b, c=4, d=3):
 
     with pytest.raises(ValueError):
         ~function(2, 3, d=5)
+
+
+def test_return_value_from_async_simple_superfunction():
+    @superfunction
+    def function():
+        return 1
+
+    assert run(function()) == 1
+
+
+def test_return_awaited_value_from_async_simple_superfunction():
+    async def another_one():
+        return 1
+
+    @superfunction
+    def function():
+        return await_it(another_one())
+
+    assert run(function()) == 1
+
+
+def test_return_value_from_async_superfunction_with_arguments():
+    @superfunction
+    def function(a, b=5, c=10):
+        return a + b + c
+
+    assert run(function(2, b=3)) == 15
+
+
+def test_return_awaited_value_from_async_superfunction_with_arguments():
+    async def another_one(a, b, c):
+        return a + b + c
+
+    @superfunction
+    def function(a, b=5, c=10):
+        return await_it(another_one(a, b, c))
+
+    assert run(function(2, b=3)) == 15
+
+
+def test_call_superfunction_with_tilda_multiple_times():
+    @superfunction
+    def function():
+        return 4
+
+    assert ~function() == 4
+    assert ~function() == 4
+    assert ~function() == 4
+
+
+def test_async_call_superfunction_multiple_times():
+    @superfunction
+    def function():
+        return 4
+
+    assert run(function()) == 4
+    assert run(function()) == 4
+    assert run(function()) == 4
+
+
+def test_generator_call_superfunction_multiple_times():
+    @superfunction
+    def function():
+        yield 4
+
+    assert list(function()) == [4]
+    assert list(function()) == [4]
+    assert list(function()) == [4]
+
+
+def test_combine_with_other_decorator_before():
+    def other_decorator(function):
+        return function
+
+    @superfunction
+    @other_decorator
+    def template():
+        pass
+
+    with pytest.raises(WrongDecoratorSyntaxError, match=full_match('The @superfunction decorator cannot be used in conjunction with other decorators.')):
+        ~template()
+
+
+def test_combine_with_other_decorator_after():
+    def other_decorator(function):
+        return function
+
+    @other_decorator
+    @superfunction
+    def template():
+        pass
+
+    with pytest.raises(WrongDecoratorSyntaxError, match=full_match('The @superfunction decorator cannot be used in conjunction with other decorators.')):
+        ~template()

tests/units/decorators/test_transfunction.py

@@ -745,3 +745,29 @@ def template(self, a, b=5):
 
     assert isinstance(some_class_instance.template, FunctionTransformer)
     assert list(some_class_instance.template.get_generator_function()(2)) == [9]
+
+
+def test_combine_with_other_decorator_before():
+    def other_decorator(function):
+        return function
+
+    @transfunction
+    @other_decorator
+    def template():
+        pass
+
+    with pytest.raises(WrongDecoratorSyntaxError, match=full_match('The @transfunction decorator cannot be used in conjunction with other decorators.')):
+        template.get_usual_function()
+
+
+def test_combine_with_other_decorator_after():
+    def other_decorator(function):
+        return function
+
+    @other_decorator
+    @transfunction
+    def template():
+        pass
+
+    with pytest.raises(WrongDecoratorSyntaxError, match=full_match('The @transfunction decorator cannot be used in conjunction with other decorators.')):
+        template.get_usual_function()

transfunctions/decorators/superfunction.py

@@ -63,7 +63,7 @@ def sync_sleep_option(flags: Dict[str, bool], args, kwargs, transformer, wrapped
     @staticmethod
     async def async_sleep_option(flags: Dict[str, bool], args, kwargs, transformer) -> None:
         flags['used'] = True
-        await transformer.get_async_function()(*args, **kwargs)
+        return await transformer.get_async_function()(*args, **kwargs)
 
 
 not_display(UsageTracer)