TG-124 : Remise a niveau des TU
This commit is contained in:
@ -12,10 +12,12 @@ class GroupTestCase(unittest.TestCase):
|
||||
|
||||
@classmethod
|
||||
def setUpClass(cls):
|
||||
query = USER.insert().values(login="admin", email="admin@admin.com", role="4", phone="00.00.00.00.00")
|
||||
query = USER.insert().values(email="admin@admin.com", role="4", phone="00.00.00.00.00", name="admin",
|
||||
hash="toto")
|
||||
res = query.execute()
|
||||
cls.uid = res.lastrowid
|
||||
query = USER.insert().values(login="adminx", email="adminx@admin.com", role="3", phone="00.00.00.00.00")
|
||||
query = USER.insert().values(email="adminx@admin.com", role="3", phone="00.00.00.00.00", name="adminx",
|
||||
hash="zozo")
|
||||
res = query.execute()
|
||||
cls.uid2 = res.lastrowid
|
||||
|
||||
@ -25,9 +27,9 @@ class GroupTestCase(unittest.TestCase):
|
||||
query.execute()
|
||||
query = GROUP.delete().where(group_class.name == "group_test2")
|
||||
query.execute()
|
||||
query = USER.delete().where(user_class.login == "admin")
|
||||
query = USER.delete().where(user_class.email == "admin@admin.com")
|
||||
query.execute()
|
||||
query = USER.delete().where(user_class.login == "adminx")
|
||||
query = USER.delete().where(user_class.email == "adminx@admin.com")
|
||||
query.execute()
|
||||
|
||||
def setUp(self):
|
||||
|
@ -13,9 +13,9 @@ class UserTestCase(unittest.TestCase):
|
||||
|
||||
@classmethod
|
||||
def tearDownClass(cls):
|
||||
query = USER.delete().where(user_class.login == "admin")
|
||||
query = USER.delete().where(user_class.email == "admin@admin.com")
|
||||
query.execute()
|
||||
query = USER.delete().where(user_class.login == "adminx")
|
||||
query = USER.delete().where(user_class.email == "admin@admin.com")
|
||||
query.execute()
|
||||
|
||||
def setUp(self):
|
||||
@ -24,42 +24,41 @@ class UserTestCase(unittest.TestCase):
|
||||
def tearDown(self):
|
||||
pass
|
||||
|
||||
def create_user(self, login, role):
|
||||
def create_user(self, email, role, name):
|
||||
return self.app.post('/api/user',
|
||||
data=json.dumps(
|
||||
dict(
|
||||
CASid=login,
|
||||
role=role
|
||||
email=email,
|
||||
role=role,
|
||||
name=name
|
||||
)
|
||||
), content_type='application/json')
|
||||
|
||||
def getUserByID(self, UID):
|
||||
return self.app.get('/api/user/byuid/' + str(UID))
|
||||
|
||||
def getUserByLogin(self, login):
|
||||
return self.app.get('/api/user/bylogin/' + login)
|
||||
|
||||
def getUserByEmail(self, email):
|
||||
return self.app.get('/api/user/byemail/' + email)
|
||||
|
||||
def change_user(self, UID, login, role, email, phone):
|
||||
def change_user(self, UID, email, role, phone, name, password):
|
||||
return self.app.put('/api/user/byuid/' + str(UID),
|
||||
data=json.dumps(
|
||||
dict(
|
||||
CASid=login,
|
||||
role=role,
|
||||
email=email,
|
||||
phone=phone
|
||||
phone=phone,
|
||||
name=name,
|
||||
password=password
|
||||
)
|
||||
), content_type='application/json')
|
||||
|
||||
def test_user(self):
|
||||
rv = self.create_user('admin', '4')
|
||||
rv = self.create_user('admin@admin.com', '4', 'Admin')
|
||||
self.assertEqual(rv.status_code, 201, 'Creating user Failed')
|
||||
uid = json.loads(rv.data)['UID']
|
||||
self.assertIsNotNone(uid)
|
||||
|
||||
rv = self.create_user('admin', '4')
|
||||
rv = self.create_user('admin@admin.com', '4', 'Admin')
|
||||
self.assertEqual(rv.status_code, 200, 'User is supposed to already exist')
|
||||
uid2 = json.loads(rv.data)['UID']
|
||||
self.assertEqual(uid, uid2, "The UID must be the same !")
|
||||
@ -69,23 +68,18 @@ class UserTestCase(unittest.TestCase):
|
||||
user = json.loads(rv.data)['USER']
|
||||
self.assertIsNotNone(user)
|
||||
|
||||
rv = self.getUserByLogin("admin")
|
||||
self.assertEqual(rv.status_code, 200, 'Getting user failed by Login')
|
||||
user2 = json.loads(rv.data)['USER']
|
||||
self.assertEqual(user, user2, "User by login must be the same !")
|
||||
|
||||
rv = self.getUserByEmail("admin@ola.com")
|
||||
rv = self.getUserByEmail("admin@admin.com")
|
||||
self.assertEqual(rv.status_code, 200, 'Getting user failed by email')
|
||||
user3 = json.loads(rv.data)['USER']
|
||||
self.assertEqual(user, user3, "User by email must be the same !")
|
||||
|
||||
rv = self.change_user(uid, 'adminx', '3', 'adminx@email.com', '11.11.11.11.11')
|
||||
rv = self.change_user(uid, 'adminx@admin.com', '3', '11.11.11.11.11', 'Adminx', 'password')
|
||||
self.assertEqual(rv.status_code, 200, 'User modification failed !')
|
||||
uid3 = json.loads(rv.data)['UID']
|
||||
self.assertEqual(uid, uid3, "UIDs doesn't match !")
|
||||
|
||||
rv = self.getUserByLogin("adminx")
|
||||
self.assertEqual(rv.status_code, 200, 'Getting modified user failed by Login')
|
||||
rv = self.getUserByEmail("adminx@admin.com")
|
||||
self.assertEqual(rv.status_code, 200, 'Getting modified user failed by Email')
|
||||
user4 = json.loads(rv.data)['USER']
|
||||
self.assertIsNotNone(user4, "Modified user shouldn't be None !")
|
||||
|
||||
|
Reference in New Issue
Block a user