From cf73072caaa1b428b9d65c1f83feda0a5b6bac8b Mon Sep 17 00:00:00 2001
From: Tony Wang <wwwjfy@gmail.com>
Date: Sun, 26 Aug 2018 13:52:13 +0800
Subject: [PATCH] fix test cases

---
 tests/test_aiohttp.py     |  5 ++---
 tests/test_executemany.py | 29 ++++++++++++++++++++++-------
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/tests/test_aiohttp.py b/tests/test_aiohttp.py
index e8fa1ba3..76b0e209 100644
--- a/tests/test_aiohttp.py
+++ b/tests/test_aiohttp.py
@@ -22,7 +22,7 @@ class User(db.Model):
         __tablename__ = 'gino_users'
 
         id = db.Column(db.BigInteger(), primary_key=True)
-        nickname = db.Column(db.Unicode(), default='noname')
+        nickname = db.Column('name', db.Unicode(), default='noname')
 
     routes = web.RouteTableDef()
 
@@ -107,8 +107,7 @@ async def _test(test_client):
         response = await test_client.get('/users/1?method=' + method)
         assert response.status == 404
 
-    response = await test_client.post('/users',
-                                      data=dict(name='fantix'))
+    response = await test_client.post('/users', data=dict(name='fantix'))
     assert response.status == 200
     assert await response.json() == dict(id=1, nickname='fantix')
 
diff --git a/tests/test_executemany.py b/tests/test_executemany.py
index e51fca7a..0458a84e 100644
--- a/tests/test_executemany.py
+++ b/tests/test_executemany.py
@@ -20,34 +20,49 @@ async def test_status(bind):
 # noinspection PyUnusedLocal
 async def test_all(bind):
     result = await User.insert().returning(User.nickname).gino.all(
-        dict(nickname='1'), dict(nickname='2'))
+        dict(name='1'), dict(name='2'))
     assert result is None
-    assert len(await User.query.gino.all()) == 2
+    rows = await User.query.gino.all()
+    assert len(rows) == 2
+    assert set(u.nickname for u in rows) == {'1', '2'}
 
     result = await User.insert().gino.all(
-        dict(nickname='3'), dict(nickname='4'))
+        dict(name='3'), dict(name='4'))
     assert result is None
+    rows = await User.query.gino.all()
+    assert len(rows) == 4
+    assert set(u.nickname for u in rows) == {'1', '2', '3', '4'}
 
 
 # noinspection PyUnusedLocal
 async def test_first(bind):
     result = await User.insert().returning(User.nickname).gino.first(
-        dict(nickname='1'), dict(nickname='2'))
+        dict(name='1'), dict(name='2'))
     assert result is None
+    rows = await User.query.gino.all()
     assert len(await User.query.gino.all()) == 2
+    assert set(u.nickname for u in rows) == {'1', '2'}
 
     result = await User.insert().gino.first(
-        dict(nickname='3'), dict(nickname='4'))
+        dict(name='3'), dict(name='4'))
     assert result is None
+    rows = await User.query.gino.all()
+    assert len(rows) == 4
+    assert set(u.nickname for u in rows) == {'1', '2', '3', '4'}
 
 
 # noinspection PyUnusedLocal
 async def test_scalar(bind):
     result = await User.insert().returning(User.nickname).gino.scalar(
-        dict(nickname='1'), dict(nickname='2'))
+        dict(name='1'), dict(name='2'))
     assert result is None
+    rows = await User.query.gino.all()
     assert len(await User.query.gino.all()) == 2
+    assert set(u.nickname for u in rows) == {'1', '2'}
 
     result = await User.insert().gino.scalar(
-        dict(nickname='3'), dict(nickname='4'))
+        dict(name='3'), dict(name='4'))
     assert result is None
+    rows = await User.query.gino.all()
+    assert len(rows) == 4
+    assert set(u.nickname for u in rows) == {'1', '2', '3', '4'}