加入新增接口的用例，调整了其余用例中冗余的代码

175930106 · liujiqiang
1 parent 7de68791
Showing 22 changed files with 196 additions and 153 deletions
src/commons/api/__pycache__/doAdd.cpython-36.pyc
src/commons/api/__pycache__/fieldConfig.cpython-36.pyc
src/commons/api/__pycache__/login.cpython-36.pyc
src/commons/api/__pycache__/upStream.cpython-36.pyc
src/commons/api/doAdd.py
src/commons/api/fieldConfig.py
src/commons/api/login.py
src/commons/api/upStream.py
src/config/account.conf
src/config/global_data.conf
src/testcase/doAdd/.gitignore
src/testcase/doAdd/__init__.py
src/testcase/doAdd/__pycache__/__init__.cpython-36.pyc
src/testcase/doAdd/__pycache__/test_Systemskip.cpython-36.pyc
src/testcase/doAdd/__pycache__/test_Userskip.cpython-36.pyc
src/testcase/doAdd/__pycache__/test_tms_myrequest1.cpython-36.pyc
src/testcase/doAdd/__pycache__/test_tms_myrequest_demo.cpython-36.pyc
src/testcase/doAdd/__pycache__/test_upStream.cpython-36.pyc
src/testcase/doAdd/test_doAdd.py
src/testcase/fieldConfig/test_fieldConfig.py
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+import requests
+import json
+import urllib3
+from commons import common as com
+from commons.api.login import login
+urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
+ll=login()
+
+class doAdd():
+    
+    url="http://test.trace.diligrp.com:8393/newRegisterBill/doAdd.action"
+    header={
+            "Host": "test.trace.diligrp.com",
+            "Connection": "keep-alive",
+            "Content-Length": "325",
+            "Accept": "application/json,text/javascript,*/*;q=0.01",
+            "User-Agent": "Mozilla/5.0(WindowsNT10.0;Win64;x64)AppleWebKit/537.36(KHTML,likeGecko)Chrome/90.0.4430.212Safari/537.36",
+            "Content-Type": "application/json",
+            "Origin": "http://test.trace.diligrp.com:8393",
+            "Referer": "http://test.trace.diligrp.com:8393/newRegisterBill/add.html",
+            "Accept-Encoding": "gzip,deflate",
+            "Accept-Language": "zh-CN,zh-TW;q=0.9,zh;q=0.8,en;q=0.7"}
+    body={"registerHeadWeight":"0","registerHeadRemainWeight":"0","imageCertList":[],"measureType":20,"registType":10,"userId":516,"arrivalTallynos":[],"arrivalDatetime":"","truckType":10,"weight":"111","weightUnit":1,"productName":"大白菜","productId":2190,"originName":"","originId":"","unitPrice":"","truckTareWeight":"","remark":"","specName":"","brandName":"","plate":"川A123456"}
+    
+    
+    def __init__(self):
+        self.url=doAdd.url.replace("http://test.",com.get_global_config("global_data", "environment", "en") )
+        self.header=doAdd.header
+        self.body=doAdd.body
+
+    def post(self,account,**kwargs):
+        #解决不同接口对于不同用户的场景
+        se=ll.get_session(account)
+        re=se.post(**kwargs)
+        ll.close_session()
+        return re
+
+
+
+
+tt=doAdd()
+tt.post("user01",url=tt.url,headers=tt.header,json=tt.body,proxies={'http': 'http://localhost:8888'})
+
@@ -3,13 +3,11 @@
 import requests
 import json
 import urllib3
-from commons import ConfigDB as db
 from commons import common as com
 from commons.api.login import login
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 ll=login()
-#列表查询
 class fieldConfig(login):
     url="http://test.trace.diligrp.com:8393/fieldConfig/doUpdate.action"
@@ -29,9 +27,9 @@ class fieldConfig(login):
     body={"moduleType":"1","marketId":"8","fieldConfigDetailList":[{"fieldName":"unitPrice","jsonPath":"$.unitPrice","defaultId":"3","displayed":"1","required":"0"},{"fieldName":"arrivalTallynos","jsonPath":"$.arrivalTallynos","defaultId":"10","displayed":"1","required":"0"},{"fieldName":"brandName","jsonPath":"$.brandName","defaultId":"5","displayed":"1","required":"0"},{"fieldName":"truckTareWeight","jsonPath":"$.truckTareWeight","defaultId":"1","displayed":"1","required":"0"},{"fieldName":"originId","jsonPath":"$.originId","defaultId":"7","displayed":"1","required":"0"},{"fieldName":"specName","jsonPath":"$.specName","defaultId":"4","displayed":"1","required":"0"},{"fieldName":"truckType","jsonPath":"$.truckType","defaultId":"2","displayed":"1","required":"1","availableValueList":["10","20"]},{"fieldName":"imageCertList","jsonPath":"$.imageCertList[*]certType","defaultId":"11","displayed":"1","required":"0","availableValueList":["2","3"]},{"fieldName":"arrivalDatetime","jsonPath":"$.arrivalDatetime","defaultId":"9","displayed":"1","required":"0"},{"fieldName":"remark","jsonPath":"$.remark","defaultId":"8","displayed":"1","required":"0"},{"fieldName":"remark","jsonPath":"$.remark","defaultId":"6","displayed":"1","required":"0"},{"fieldName":"measureType","jsonPath":"$.measureType","defaultId":"12","displayed":"1","required":"1","availableValueList":["10","20"]}]}
     def __init__(self):
-        self.url=login.url.replace("test.uap.diligrp.com",com.get_global_config("global_data", "environment", "en") )
-        self.header=login.header
-        self.body=login.body
+        self.url=fieldConfig.url.replace("http://test.",com.get_global_config("global_data", "environment", "en") )
+        self.header=fieldConfig.header
+        self.body=fieldConfig.body
     def post(self,account,**kwargs):
         se=ll.get_session(account)
@@ -39,14 +37,8 @@ class fieldConfig(login):
         ll.close_session()
         return re
-    def post2(self,session,account,**kwargs):
-        #解决不同接口对于不同用户的场景
-        se=ll.get_session(account)
-        re=session.post(**kwargs)
-        ll.close_session()
-        return re
 # tt=fieldConfig()
-
-# tt.demo("sg_wenze", "111111",proxies={'http': 'http://localhost:8888'})
+#   
+# tt.post("user01",url=tt.url,headers=tt.header,json=tt.body,proxies={'http': 'http://localhost:8888', 'https': 'http://localhost:8888'})
@@ -3,11 +3,9 @@
 import requests
 import json
 import urllib3
-from commons import ConfigDB as db
 from commons import common as com
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
-#列表查询
 class login():
     url="http://test.uap.diligrp.com/login/login.action"
     header={
@@ -27,7 +25,7 @@ class login():
     body="userName=sg_wenze&password=111111"
     def __init__(self):
-        self.url=login.url.replace("test.uap.diligrp.com",com.get_global_config("global_data", "environment", "en") )
+        self.url=login.url.replace("http://test.",com.get_global_config("global_data", "environment", "en") )
         self.header=login.header
         self.body=login.body
@@ -39,27 +37,16 @@ class login():
         return self.se    
     def close_session(self):
-        print("close session")
         self.se.close()
-    def post(self,name,password,firmid,**kwargs):
+    def post(self,name,password,**kwargs):
         self.body=self.body.replace("sg_wenze", name)
         self.body=self.body.replace("111111", password)
-        re=requests.post(url=self.url, headers=self.header,data=self.body,**kwargs)
-
-        print(re.headers)
+        re=requests.post(url=self.url, headers=self.header,data=self.body,allow_redirects=False,**kwargs)
         return re
 # t=login()
-# print(t.url)
 # t.get_session2("user01",proxies={'http': 'http://localhost:8888', 'https': 'http://localhost:8888'},allow_redirects=False)
-# t.post("sg_wenze", "111111",proxies={'http': 'http://localhost:8888', 'https': 'http://localhost:8888'})
-# def tt(**kwargs):
-#     print(kwargs)
-
-# t.get_session(http="http://localhost:8888", https="http://localhost:8888")
-# t.post("sg_wenze", "1111111",proxies={'http': 'http://localhost:8888', 'https': 'http://localhost:8888'})
-
@@ -3,14 +3,12 @@
 import requests
 import json
 import urllib3
-from commons import ConfigDB as db
 from commons import common as com
 from commons.api.login import login
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 ll=login()
-#列表查询
-class upStream(login):
+class upStream():
     url="http://test.trace.diligrp.com:8393/upStream/listPage.action"
     header={
@@ -29,9 +27,9 @@ class upStream(login):
     def __init__(self):
-        self.url=login.url.replace("test.uap.diligrp.com",com.get_global_config("global_data", "environment", "en") )
-        self.header=login.header
-        self.body=login.body
+        self.url=upStream.url.replace("http://test.",com.get_global_config("global_data", "environment", "en") )
+        self.header=upStream.header
+        self.body=upStream.body
     def post(self,account,**kwargs):
         #解决不同接口对于不同用户的场景
@@ -40,7 +38,11 @@ class upStream(login):
         ll.close_session()
         return re
-tt=upStream()
+
+
+
+# tt=upStream()
+# print(tt.url)
 # print(id(tt.body))
 # print(id(upStream.body))
 # tt.body["order"]=111
-[account]
-sg_01=sg_wenze&111111
-sg_02=sg_wenze&111111
-sy_01=666
-sy_01=111
-hs_01=666
-hs_01=111
-
-[sy]
-username01=666
-password01=111
-username02=666
-password02=111
-
-[hs]
-username01=666
-password01=111
-username02=666
-password02=111
-
-
-[firmid]
-
-[evnironment]
-
-
-
-[Database]
-dbhost=10.28.10.169
-dbport=3306
-dbname=trace
-dbuser=root
-dbpassword=123456
-dbcharset=utf8
@@ -6,7 +6,7 @@ user02=sy_wenze&amp;111111
 user03=hz_wenze&111111
 [environment]
-en=test.uap.diligrp.com
+en=http://test.
 [Database]
 dbhost=10.28.10.169
+/__init__.pyc
+# -*- coding:utf-8 -*-
+import binascii
+import base64
+import requests,json
+import time
+# import sys
+# reload(sys)
+# sys.setdefaultencoding('utf8')
 \ No newline at end of file
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+import unittest
+import json
+import urllib3
+from commons.api.login import login
+from commons.api.fieldConfig import fieldConfig
+from commons.api.doAdd import doAdd
+urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
+ll=login()
+do=doAdd()
+field=fieldConfig()
+
+#列表查询
+class test_doAdd(unittest.TestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        #新增登记单
+        cls.se=ll.get_session("user01",allow_redirects=False)
+        field.post("user01",url=field.url,headers=field.header,json=field.body)
+
+    def setUp(self):
+        pass
+    
+    def test_01_doAdd(self):
+        #成功新增一个商品为大白菜的报备单，重量为111
+        re=self.se.post(url=do.url,headers=do.header,json=do.body,proxies={'http': 'http://localhost:8888', 'https': 'http://localhost:8888'})
+        print(re.json())
+        self.assertEqual(re.status_code, 200)
+        self.assertTrue("'code':'200'" in str(re.json()).replace(" ",""))
+        
+    def test_02_doAdd(self):
+        #成功新增一个商品为鲜花生的报备单，重量为111
+        body=do.body.copy()
+        body["productName"]="鲜花生"
+        body["productId"]="3496"
+        re=self.se.post(url=do.url,headers=do.header,json=body,proxies={'http': 'http://localhost:8888', 'https': 'http://localhost:8888'})
+        print(re.json())
+        self.assertEqual(re.status_code, 200)
+        self.assertTrue("'code':'200'" in str(re.json()).replace(" ",""))
+
+    def test_03_doAdd(self):
+        #用错误的用户来新增，无法新增
+        body=do.body.copy()
+        body["userId"]="516111"
+        re=self.se.post(url=do.url,headers=do.header,json=body,proxies={'http': 'http://localhost:8888', 'https': 'http://localhost:8888'})
+        print(re.json())
+        self.assertEqual(re.status_code, 200)
+        self.assertTrue("查询客户信息失败" in str(re.json()).replace(" ",""))
+
+
+    def tearDown(self):
+        pass
+           
+    @classmethod
+    def tearDownClass(cls):
+        cls.se.close()
+
+
+
+if __name__ == "__main__":
+#unittest.main()方法会搜索该模块文件下所有以test开头的测试用例方法，并自动执行它们。
+#如果不加下面这个语句，那么在通过unittest的方法添加测试用例时，这个文件里面的用例不会被搜索到。
+
+#     unittest.main(verbosity=2)
+
+# #    以下代码可以调试单个测试用例,用例中打印的语句不会展示到控制台,使用前需要注释上面的代码unittest.main(),如果不使用下面代码，
+# #    在有unittest.main()的情况下点击ctrl+f11,会直接运行当前页面所有用例，并且把用例用有打印的语句显示到控制台
+    current_suite = unittest.TestSuite()
+    current_suite.addTest(test_doAdd("test_03_doAdd"))
+#     #以列表形式添加多个测试用例
+# #     current_suite.addTests([submitOrder_With_Coupon("test_01"),submitOrder_With_Coupon("test_02")])
+#     # 执行测试
+    runner = unittest.TextTestRunner()
+##    runner.run(可以直接添加测试用例如submitOrder_With_Coupon("test_01"))
+    runner.run(current_suite)
 \ No newline at end of file
@@ -3,37 +3,31 @@
 import unittest
 import json
 import urllib3
-from commons import ConfigDB as db
-from commons import common as com
 from commons.api.login import login
-from commons.api.upStream import upStream
-from commons.MyRequest import myrequest
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 ll=login()
-uu=upStream()
-my=myrequest()
+
 class test_fieldConfig(unittest.TestCase):
-    '''分别封装各个接口和数据，数据处理过程写入代码'''
+
     @classmethod
     def setUpClass(cls):
         #获取session
-        cls.se=ll.get_session("sg_wenze", "111111")
+        pass
     def setUp(self):
         pass
     def test_01_fieldConfig(self):
-        #成功查询上下游企业,无过滤条件
         pass
     def tearDown(self):
-        print("tearDown")
+        pass
     @classmethod
     def tearDownClass(cls):
-        cls.se.close()
+        pass
@@ -3,40 +3,45 @@
 import unittest
 import json
 import urllib3
-from commons import ConfigDB as db
-from commons import common as com
 from commons.api.login import login
-from commons.api.upStream import upStream
-from commons.MyRequest import myrequest
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 ll=login()
-uu=upStream()
-my=myrequest()
+
 class test_login(unittest.TestCase):
-    '''分别封装各个接口和数据，数据处理过程写入代码'''
+
     @classmethod
     def setUpClass(cls):
-        #获取session
-        cls.se=ll.get_session("sg_wenze", "111111")
-        
+        pass
+ 
     def setUp(self):
         pass
     def test_01_login(self):
-        #成功查询上下游企业,无过滤条件
-        pass
+        #账户密码都正确
+        re=ll.post("sg_wenze", "111111")
+#         print(re.headers)
+        self.assertTrue("Set-Cookie" in re.headers.keys())
+        
+    def test_02_login(self):
+        #密码错误
+        re=ll.post("sg_wenze", "111111111111")
+#         print(re.text)
+        self.assertTrue("用户名或密码错误" in re.text)
+
+    def test_03_login(self):
+        #账户错误
+        re=ll.post("sg_wenze11111111", "11111")
+#         print(re.text)
+        self.assertTrue("用户名或密码错误" in re.text)
     def tearDown(self):
-        print("tearDown")
+        pass
     @classmethod
     def tearDownClass(cls):
-        cls.se.close()
-
-
-
+        pass
 if __name__ == "__main__":
@@ -3,103 +3,69 @@
 import unittest
 import json
 import urllib3
-from commons import ConfigDB as db
-from commons import common as com
 from commons.api.login import login
 from commons.api.upStream import upStream
-from commons.MyRequest import myrequest
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 ll=login()
 uu=upStream()
-my=myrequest()
 #列表查询
 class test_upStream1(unittest.TestCase):
-    
+
     @classmethod
     def setUpClass(cls):
         #新增登记单
-        cls.se=ll.get_session("user01")
+        cls.se=ll.get_session("user01",allow_redirects=False)
     def setUp(self):
         pass
     def test_01_upStream1(self):
         #成功查询上下游企业,无过滤条件
-        re=self.se.post(url=uu.url,headers=uu.header,json=uu.body)
+        re=self.se.post(url=uu.url,headers=uu.header,json=uu.body,proxies={'http': 'http://localhost:8888', 'https': 'http://localhost:8888'})
         print(re.json())
         self.assertEqual(re.status_code, 200)
-
+        self.assertTrue("total" in re.json().keys())
+        self.assertTrue("上游" in str(re.json()).replace(" ",""))
+        
     def test_02_upStream1(self):
         #成功查询上下游企业,加入企业/个人名称过滤条件
         body=uu.body.copy()
         body["likeName"]="111"
-        re=self.se.post(url=uu.url,headers=uu.header,json=uu.body)
+        re=self.se.post(url=uu.url,headers=uu.header,json=body,proxies={'http': 'http://localhost:8888', 'https': 'http://localhost:8888'})
         print(re.json())
         self.assertEqual(re.status_code, 200)
+        self.assertTrue("legalPerson':'哈哈哈'" in str(re.json()).replace(" ",""))
-#     def test_03_upStream1(self):
-#         #成功查询上下游企业,加入业户名称名称过滤条件---使用不同的用户来调用接口
-#         re=uu.post("user01",url=uu.url,headers=uu.header,json=uu.body)
-#         print("test_03_upStream",re.json())
-#         print(re.json())
-#         self.assertEqual(re.status_code, 200)
+    def tearDown(self):
+        pass
+           
+    @classmethod
+    def tearDownClass(cls):
+        cls.se.close()
 class test_upStream2(unittest.TestCase):
-    
-    @classmethod
-    def setUpClass(cls):
-        pass
-    def setUp(self):
-        pass
-    
     def test_01_upStream2(self):
-        #成功查询上下游企业,无过滤条件
-        re=uu.post(url=uu.url,headers=uu.header,json=uu.body)
-        print(re.json())
-        self.assertEqual(re.status_code, 200)
-
-    def test_02_upStream2(self):
         #成功查询上下游企业,加入企业/个人名称过滤条件
         body=uu.body.copy()
         body["likeName"]="111"
-        re=uu.post("sg_wenze", "111111",url=uu.url,headers=uu.header,json=body)
+        re=uu.post("user01",url=uu.url,headers=uu.header,json=body)
         print(re.json())
         self.assertEqual(re.status_code, 200)
+        self.assertTrue("legalPerson':'哈哈哈'" in str(re.json()).replace(" ",""))
-    def test_03_upStream2(self):
+    def test_02_upStream2(self):
         #成功查询上下游企业,加入业户名称名称过滤条件
         body=uu.body.copy()
         body["likeUserName"]="地利人和"
-        re=uu.post("sg_wenze", "111111",url=uu.url,headers=uu.header,json=body)
+        re=uu.post("user01",url=uu.url,headers=uu.header,json=body)
         print(re.json())
         self.assertEqual(re.status_code, 200)
+        self.assertTrue("userNames':'地利人和'" in str(re.json()).replace(" ",""))
-#     def test_04_upStream2(self):
-#         #成功查询上下游企业,加入业户名称名称过滤条件---实验直接传session给接口类使用(封装使用)
-#         re=uu.post2(self.se,"user01",url=uu.url,headers=uu.header,json=uu.body)
-#         print("test_03_upStream",re.json())
-#         print(re.json())
-#         self.assertEqual(re.status_code, 200)
-#   
-#     def test_05_upStream2(self):
-#         #成功查询上下游企业,加入业户名称名称过滤条件
-#         #使用公共的请求方法,数据需要单独维护
-#         re=my.post2(self.se,"test_01_upStream")
-#         print("test_04_upStream",re.json())
-#         self.assertEqual(re.status_code, 200)
-
-    def tearDown(self):
-        print("tearDown")
-           
-    @classmethod
-    def tearDownClass(cls):
-        cls.se.close()
-        
-
 if __name__ == "__main__":
 #unittest.main()方法会搜索该模块文件下所有以test开头的测试用例方法，并自动执行它们。
 #如果不加下面这个语句，那么在通过unittest的方法添加测试用例时，这个文件里面的用例不会被搜索到。
@@ -109,7 +75,7 @@ if __name__ == &quot;__main__&quot;:
 # #    以下代码可以调试单个测试用例,用例中打印的语句不会展示到控制台,使用前需要注释上面的代码unittest.main(),如果不使用下面代码，
 # #    在有unittest.main()的情况下点击ctrl+f11,会直接运行当前页面所有用例，并且把用例用有打印的语句显示到控制台
     current_suite = unittest.TestSuite()
-    current_suite.addTest(test_upStream1("test_01_upStream1"))
+    current_suite.addTest(test_upStream2("test_01_upStream2"))
 #     #以列表形式添加多个测试用例
 # #     current_suite.addTests([submitOrder_With_Coupon("test_01"),submitOrder_With_Coupon("test_02")])
 #     # 执行测试