3.4 compat

README.rst

@@ -17,7 +17,7 @@ This is a helper library to ease of your pain (and boilerplate), when writing a
 * synchronous code (same as the :code:`unittest.TestCase`)
 * asynchronous code, it supports syntax with :code:`async`/:code:`await` (Python 3.5+) and :code:`asyncio.coroutine`/:code:`yield from` (Python 3.4)
 
-
+ 
 Installation
 ============
 
@@ -27,7 +27,7 @@ Use pip:
 
     pip install aiounittest
 
-
+ 
 Usage
 =====
 
@@ -59,7 +59,11 @@ It's as simple as use of :code:`unittest.TestCase`. Full docs at http://aiounitt
         def test_something(self):
             self.assertTrue(true)
 
-Library exposes some other helpers like async_test_, AsyncMockIterator_, futurized_ to mock coroutines.
+Library provide some additional tooling:
+
+* async_test_,
+* AsyncMockIterator_ to mock object for `async for`,
+* futurized_ to mock coroutines.
 
 .. _futurized: http://aiounittest.readthedocs.io/en/latest/futurized.html
 .. _async_test: http://aiounittest.readthedocs.io/en/latest/async_test.html

aiounittest/__init__.py

@@ -1,2 +1,2 @@
 from .case import AsyncTestCase
-from .helpers import futurized, run_sync, async_test, AsyncMockIterator
+from .helpers import futurized, run_sync, async_test

aiounittest/helpers.py

@@ -149,69 +149,3 @@ def wrapper(*args, **kwargs):
 
 
 async_test = run_sync
-
-
-class AsyncMockIterator:
-    ''' Allows to asynchronous for loops.
-
-
-    .. code-block:: python
-
-            from aiounittest import AsyncTestCase, AsyncMockIterator
-            from unittest.mock import Mock
-
-
-            async def fetch_some_text(source):
-                res = ''
-                async for txt in source.paginate():
-                    res += txt
-                return res
-
-
-            class MyAsyncMockIteratorTest(AsyncTestCase):
-
-                async def test_add(self):
-                    source = Mock()
-                    mock_iter = AsyncMockIterator([
-                        'asdf', 'qwer', 'zxcv'
-                    ])
-                    source.paginate.return_value = mock_iter
-
-                    res = await fetch_some_text(source)
-
-                    self.assertEqual(res, 'asdfqwerzxcv')
-                    mock_iter.assertFullyConsumed()
-                    mock_iter.assertIterCount(3)
-
-
-
-    '''
-    def __init__(self, seq):
-        self.iter = iter(seq)
-        self.__consumed = False
-        self.__iter_count = 0
-
-    def __aiter__(self, *args, **kwargs):
-        return self
-
-    async def __anext__(self, *args, **kwargs):
-        try:
-            val = next(self.iter)
-            self.__iter_count += 1
-            return val
-        except StopIteration:
-            self.__consumed = True
-            raise StopAsyncIteration
-
-    def assertFullyConsumed(self):
-        ''' Does `async for` reached the end of the giden sequence
-        '''
-        assert self.__consumed, 'Iterator wasnt fully consumed'
-
-    def assertIterCount(self, expected):
-        ''' Checks whenever number of a mock iteration matches expected.
-
-        :param expected int: Expected number of iterations
-
-        '''
-        assert expected == self.__iter_count, '%d iterations instead of %d' % (self.__iter_count, expected)

docs/asyncmockiterator.rst

@@ -1,5 +1,5 @@
 AsyncMockIterator
 =================
 
-.. autoclass:: aiounittest.AsyncMockIterator
+.. autoclass:: aiounittest.mock.AsyncMockIterator
    :members: assertFullyConsumed, assertIterCount

setup.py

@@ -8,7 +8,7 @@
 setup(
     name='aiounittest',
     packages=['aiounittest'],
-    version='1.2.0',
+    version='1.2.1',
     author='Krzysztof Warunek',
     author_email='krzysztof@warunek.net',
     description='Test asyncio code more easily.',

tests/test_asyncmockiterator.py

@@ -1,5 +1,6 @@
-from aiounittest import futurized, AsyncTestCase, AsyncMockIterator
-from unittest.mock import Mock, patch
+from aiounittest import AsyncTestCase
+from aiounittest import AsyncMockIterator
+from unittest.mock import Mock
 
 
 async def fetch_some_text(source):
@@ -22,4 +23,3 @@ async def test_add(self):
         self.assertEqual(res, 'asdfqwerzxcv')
         mock_iter.assertFullyConsumed()
         mock_iter.assertIterCount(3)
-