Merge branch 'feature/liuyang' into 'master'

角色/岗位/人员列表 See merge request !13

Merge branch 'feature/liuyang' into 'master'
角色/岗位/人员列表 See merge request !13
刘洋
2 parents 01959699 179742b2
Showing 16 changed files with 234 additions and 73 deletions
atdd/__pycache__/ATDDCase.cpython-36.pyc
atdd/__pycache__/PcPost.cpython-36.pyc
tests/Staff_Management/MemberList/Attribute/__init__.py
tests/Staff_Management/MemberList/Attribute/test_add_Attribute.py
tests/Staff_Management/MemberList/JobList/get_jobid.py
tests/Staff_Management/MemberList/JobList/test_add_job.py
tests/Staff_Management/MemberList/JobList/test_delete_job.py
tests/Staff_Management/MemberList/JobList/test_jobMode.py
tests/Staff_Management/MemberList/MemberList/get_menInf.py
tests/Staff_Management/MemberList/MemberList/test_memuid_list.py → tests/Staff_Management/MemberList/MemberList/test_add_mem.py
tests/Staff_Management/MemberList/MemberList/test_delete_mem.py
tests/Staff_Management/MemberList/MemberList/test_detail_mem.py
tests/Staff_Management/MemberList/MemberList/test_memlist_mem.py
tests/Staff_Management/MemberList/MemberList/test_search_mem.py
tests/Staff_Management/MemberList/RoleList/test_add_role.py
tests/Staff_Management/MemberList/JobList/test_roleId_jobid.py → tests/Staff_Management/MemberList/RoleList/test_roleId.py
+import unittest
+from atdd.PcPost import PcPost
+import random
+
+
+class AddAttribute(PcPost):
+    name = random.randint(1, 10000)
+    url = '/contact/Apicp/Attribute/Save'
+
+    def setUp(self):
+        self.do_login(self.host, self.mobile, self.psw, self.domain)
+
+    # 字段类型-单行文本（type1）
+    def test_Attribute1(self):
+        data = {
+            'attr_name': 'AddAttribute' + str(self.name),
+            'type': 1,
+            'is_open_cp': 1,
+            'is_open': 1,
+            'is_required_cp': 1,
+        }
+        result = self.PcPost(self.url, data)
+        print('接口地址：' + self.host + self.domain + self.url)
+        jobId = result['result']['jobId']
+        self.assertEqual('ok', result['errmsg'], msg=result['errmsg'])
+        print('成功生成岗位！岗位ID：' + jobId)
+        return result
+
+if __name__ == '__main__':
+    unittest.main()
+import unittest
+from atdd.PcPost import PcPost
+import random
+
+class JobId(PcPost):
+    def setUp(self):
+        self.do_login(self.host, self.mobile, self.psw, self.domain)
+
+    # 获取岗位列表,从结果中提取所有jobId的值
+    def test_get_alljobid(self):
+        url = '/Contact/Apicp/Job/List'
+        data = {
+        }
+        result = self.PcPost(url, data)
+        resultlist = result['result']['list']  # 结果列表中的list信息
+        jobIdlist = []  # 创建空列表
+        for i in range(len(resultlist)):  # 通过序列索引进行遍历 len返回元素个数
+            jobId = result['result']['list'][i]['jobId'].split()   # 切片取出元素
+            jobIdlist[len(jobIdlist):len(jobIdlist)] = jobId
+        # print(jobIdlist)
+        return jobIdlist
+
+    def test_get_1jobid(self):
+        jobIdlist = self.test_get_alljobid()
+        x = random.randint(0, len(jobIdlist)-1)  # 在所有jobID中随机取一个ID值
+        jobId = jobIdlist[x]
+        print("从列表中取一个jobId: " + jobId)
+        return jobId
+
+if __name__ == '__main__':
+    unittest.main()
@@ -13,23 +13,12 @@ class AddJob(PcPost):
     # 正常添加岗位信息
     def test_addjob(self):
         data = {
-            'jobName': 'AddJobApi' + str(self.name)  # 如何动态读取
+            'jobName': 'AddJobApi' + str(self.name)
         }
         result = self.PcPost(self.url, data)
         print('接口地址：' + self.host + self.domain + self.url)
         jobId = result['result']['jobId']
-        print('成功生成岗位！岗位ID：' + jobId)
-        # self.assertEqual(jobId, , msg='成功生成测试jobId')  # 如何判断生成的Jobid
-        return result
-
-    # 岗位名称超过20个汉字
-    def test_addjob_namelen(self):
-        url = '/Contact/Apicp/Job/Add'
-        data = {
-            'jobName': '新增岗位接口，测试岗位名称超过20个汉字' + str(self.name)
-        }
-        result = self.PcPost(self.url, data)
-        jobId = result['result']['jobId']
+        self.assertEqual('ok', result['errmsg'], msg=result['errmsg'])
         print('成功生成岗位！岗位ID：' + jobId)
         return result
  
 import unittest
 from atdd.PcPost import PcPost
+from tests.Staff_Management.MemberList.JobList.get_jobid import JobId
  
  
-class MyTestCase(PcPost):
+class DeleteJob(PcPost):
+    url = '/Contact/Apicp/Job/Delete'
+
     def setUp(self):
         self.do_login(self.host, self.mobile, self.psw, self.domain)
  
+    # 删除岗位
+    def test_deletejob(self):
+        jobId = JobId().test_get_1jobid()
+        data = {
+            'jobId': jobId  # 参数化
+        }
+        result = self.PcPost(self.url, data)
+        # print('接口地址：' + self.host + self.domain + self.url)
+        self.assertEqual('ok', result['errmsg'], msg=result['errmsg'])
+        requestId = result['requestId']
+        print("删除成功!requestId为： " + requestId)
+        return result
+
 if __name__ == '__main__':
     unittest.main()
+import unittest
+from atdd.PcPost import PcPost
+
+
+class JobMode(PcPost):
+    url = '/Contact/Apicp/Setting/Update'
+
+    def setUp(self):
+        self.do_login(self.host, self.mobile, self.psw, self.domain)
+
+    # 岗位设置-开启手动填写
+    def test_input(self):
+        data = {
+            'jobMode': 'input'  # 手动填写
+        }
+        result = self.PcPost(self.url, data)
+        print('接口地址：' + self.host + self.domain + self.url)
+        self.assertEqual('ok', result['errmsg'], msg=result['errmsg'])
+        requestId = result['requestId']  # 从返回结果中获取requestId值
+        print('手动requestId = ' + requestId)
+        return result
+
+    # 岗位设置-开启配置选择
+    def test_select(self):
+        data = {
+            'jobMode': 'select'  # 配置选择
+        }
+        result = self.PcPost(self.url, data)
+        print('接口地址：' + self.host + self.domain + self.url)
+        self.assertEqual('ok', result['errmsg'], msg=result['errmsg'])
+        requestId = result['requestId']
+        print('选择requestId = ' + requestId)
+        return result
+
+
+if __name__ == '__main__':
+    unittest.main()
+from atdd.PcPost import PcPost
+import random
+
+
+class GetMemInf(PcPost):
+    def setUp(self):
+        self.do_login(self.host, self.mobile, self.psw, self.domain)
+
+    # 获取员工列表接口
+    def test_memnamelist(self):
+        url = "/contact/Apicp/User/DepartmentMember"
+        data = {
+        }
+        result = self.PcPost(url, data)
+        print(self.host + '/' + self.domain + url)
+        self.assertEqual("ok", result["errmsg"], msg=result["errmsg"])
+        menlist = result['result']['list']
+        mennamelist = []
+        for i in range(len(menlist)):
+            menlist = result['result']['list'][i]['name'].split()
+            mennamelist[len(mennamelist):len(mennamelist)] = menlist
+        # print(mennamelist)
+        return mennamelist
+
+    # 从人员姓名中获取一个人员的姓名
+    def test_get_onename(self):
+        namelist = self.test_memnamelist()
+        x = random.randint(0, len(namelist)-1)
+        name = namelist[x]
+        print("从列表中取一个姓名: " + name)
+        return name
+
+    # 获取员工列表接口
+    def test_memlist(self):
+        url = '/contact/Apicp/User/DepartmentMember'
+        data = {
+        }
+        result = self.PcPost(url, data)
+        print('接口地址：' + self.host + self.domain + url)
+        self.assertEqual('ok', result['errmsg'], msg=result['errmsg'])
+        list = result['result']['list']
+        memberList = []
+        for i in range(len(list)):
+            mem_Uid = result['result']['list'][i]['uid'].split()
+            memberList[len(memberList):len(memberList)] = mem_Uid
+        print(memberList)
+        return memberList
+
+    def test_get_1menid(self):
+        memuidlist = self.test_memlist()
+        x = random.randint(0, len(memuidlist)-1)
+        menuid = memuidlist[x]
+        print("从列表中取一个用户Id: " + menuid)
+        return menuid
@@ -2,25 +2,19 @@ import unittest
 from atdd.PcPost import PcPost
  
  
-class Memuid(PcPost):
+class MemDetail(PcPost):
     def setUp(self):
         self.do_login(self.host, self.mobile, self.psw, self.domain)
  
-    # 员工列表接口
-    def test_memlist(self):
-        url = '/contact/Apicp/User/DepartmentMember'
+    # 返回新增员工字段信息接口
+    def test_memdetail(self):
+        url = '/contact/Apicp/User/AttributeInfo'
         data = {
         }
         result = self.PcPost(url, data)
         print('接口地址：' + self.host + self.domain + url)
         self.assertEqual('ok', result['errmsg'], msg=result['errmsg'])
-        list = result['result']['list']
-        memberList = []
-        for i in range(len(list)):
-            mem_Uid = result['result']['list'][i]['uid'].split()
-            memberList[len(memberList):len(memberList)] = mem_Uid
-        print(memberList)
-        return memberList
+        # print(result)
  
 if __name__ == '__main__':
     unittest.main()
-import unittest
-from atdd.PcPost import PcPost
-
-
-class DeleteMem(PcPost):
-    def setUp(self):
-        self.do_login(self.host, self.mobile, self.psw, self.domain)
-
-    def test_delete_mem(self):
-        url = ''
-
-
-if __name__ == '__main__':
-    unittest.main()
@@ -13,7 +13,8 @@ class MemDetail(PcPost):
         }
         result = self.PcPost(url, data)
         print('接口地址：' + self.host + self.domain + url)
-        self.assertEqual('ok', result['errmsg'], msg=result['errmsg'])  # limit判断？   判断通过打印？
+        self.assertEqual('ok', result['errmsg'], msg=result['errmsg'])
+        self.assertEqual(0, result['errcode'], msg=result['errcode'])
         # print(result)
  
 if __name__ == '__main__':
@@ -7,12 +7,12 @@ class ReadMemList(PcPost):
     def setUp(self):
         self.do_login(self.host, self.mobile, self.psw, self.domain)
  
+    # 获取员工列表接口
     def test_memlist(self):
         url = "/contact/Apicp/User/DepartmentMember"
         data = {
         }
         result = self.PcPost(url, data)
         print(self.host + '/' + self.domain + url)
-        self.assertEqual("ok", result["errmsg"], msg=result["errmsg"])  # 怎样断言返回结果中的limit（动态）数据？
-        print(result)
+        self.assertEqual("ok", result["errmsg"], msg=result["errmsg"])
         return result
 import unittest
 from atdd.PcPost import PcPost
+from tests.Staff_Management.MemberList.MemberList.get_menInf import GetMemInf
+from tests.Staff_Management.MemberList.JobList.get_jobid import JobId
+from tests.Staff_Management.Organization.public_org import PulbicOrg
  
  
 class SearchMem(PcPost):
  
+    url = '/contact/Apicp/User/DepartmentMember'
+
     def setUp(self):
         self.do_login(self.host, self.mobile, self.psw, self.domain)
  
     # 全部列表
     def test_search_mem(self):
-        url = '/contact/Apicp/User/DepartmentMember'
         data = {
         }
-        result = self.PcPost(url, data)
-        print('接口地址:' + self.host + '/' + self.domain + url)
+        result = self.PcPost(self.url, data)
+        print('接口地址:' + self.host + '/' + self.domain + self.url)
         # print(result)
         return result
  
     # 按姓名搜索
     def test_search_name(self):
-        url = '/contact/Apicp/User/DepartmentMember'
+        name = GetMemInf().test_get_onename()
         data = {
-            'name': '刘洋'
+            'name': name
         }
-        result = self.PcPost(url, data)
-        type(result)
-        print('接口地址: ' + self.host + '/' + self.domain + url)
+        result = self.PcPost(self.url, data)
+        print('接口地址: ' + self.host + '/' + self.domain + self.url)
         self.assertEqual(0, result['errcode'], msg=result['errcode'])
-        # self.assertEqual('ok', result['errsdkcode'], msg=result['errsdkcode'])  # 怎样断言返回结果中的limit（动态）数据？
+        # print(result)
         return result
  
     # 按手机号搜索
     def test_search_mobile(self):
-        url = '/contact/Apicp/User/DepartmentMember'
         data = {
-            'mobile': 13818801804
+            'mobile': 13818801805
         }
-        result = self.PcPost(url, data)
-        print('接口地址：' + self.host + '/' + self.domain + url)
+        result = self.PcPost(self.url, data)
+        print('接口地址：' + self.host + '/' + self.domain + self.url)
         self.assertEqual(0, result['errcode'], msg=result['errcode'])
         return result
  
     # 按角色搜索
     def test_search_role(self):
-        url = '/contact/Apicp/User/DepartmentMember'
+        jobId = JobId().test_get_1jobid()
         data = {
-            'role_ids[0]': '755DE1EC0A69039F18591A299B47E6F3'  # 需动态获取角色列表数据作为参数读取
+            'role_ids[0]': jobId
         }
-        result = self.PcPost(url, data)
+        result = self.PcPost(self.url, data)
         self.assertEqual(0, result['errcode'], msg=result['errcode'])
-        print(result)  # 返回结果待验证？
         return result
  
+    # 按组织搜索
+    def test_search_org(self):
+        orgId = PulbicOrg().get_random_dptId()
+        data = {
+            'role_ids[0]': orgId
+        }
+        result = self.PcPost(self.url, data)
+        self.assertEqual(0, result['errcode'], msg=result['errcode'])
+        print(data)
+        return result
  
 if __name__ == '__main__':
     unittest.main()
+import unittest
+from atdd.PcPost import PcPost
+import random
+
+
+class Addrole(PcPost):
+    name = random.randint(1, 10000)
+    url = '/Contact/Apicp/Role/Add'
+
+    def setUp(self):
+        self.do_login(self.host, self.mobile, self.psw, self.domain)
+
+    # 正常添加岗位信息
+    def test_addrole(self):
+        data = {
+            'roleName': 'AddroleApi' + str(self.name)
+        }
+        result = self.PcPost(self.url, data)
+        print('接口地址：' + self.host + self.domain + self.url)
+        self.assertEqual('ok', result['errmsg'], msg=result['errmsg'])
+        roldId = result['result']['roleId']
+        # print('成功生成岗位！岗位ID：' + roleId)
+        return result
+
+if __name__ == '__main__':
+    unittest.main()
@@ -21,20 +21,6 @@ class RoleId(PcPost):
         print(roleidlist)
         return roleidlist
  
-    # 获取岗位列表
-    def test_get_jobid(self):
-        url = '/Contact/Apicp/Job/List'
-        data = {
-        }
-        result = self.PcPost(url, data)
-        resultlist = result['result']['list']
-        jobIdlist = []
-        for i in range(len(resultlist)):
-            jobId = result['result']['list'][i]['jobId'].split()
-            jobIdlist[len(jobIdlist):len(jobIdlist)] = jobId
-        print(jobIdlist)
-        return jobIdlist
-
  
 if __name__ == '__main__':
     unittest.main()