删除冗余的代码

175930106 · liujiqiang
1 parent 58ce55a3
Showing 37 changed files with 262 additions and 433 deletions
src/commons/MyRequest.py
src/commons/__pycache__/MyRequest.cpython-36.pyc
src/commons/__pycache__/SendEmail.cpython-36.pyc
src/commons/api/__pycache__/login.cpython-36.pyc
src/commons/api/__pycache__/upStream.cpython-36.pyc
src/commons/api/fieldConfig.py
src/commons/api/login.py
src/commons/api/upStream.py
src/config/api/fieldConfig.conf
src/main_bu.py
src/testcase/test_setup_teardown_demo/.gitignore → src/testcase/test_fieldConfig/.gitignore
src/testcase/test_setup_teardown_demo/__init__.py → src/testcase/test_fieldConfig/__init__.py
src/testcase/test_setup_teardown_demo/__pycache__/__init__.cpython-36.pyc → src/testcase/test_fieldConfig/__pycache__/__init__.cpython-36.pyc
src/testcase/test_fieldConfig/__pycache__/test_fieldConfig.cpython-36.pyc
src/testcase/test_setup_teardown_demo/__pycache__/test_setup_teardown.cpython-36.pyc → src/testcase/test_fieldConfig/__pycache__/test_setup_teardown.cpython-36.pyc
src/testcase/test_tms_myrequest/test_upStream.py → src/testcase/test_fieldConfig/test_fieldConfig.py
src/testcase/test_tms_common/.gitignore → src/testcase/test_login/.gitignore
src/testcase/test_tms_common/__init__.py → src/testcase/test_login/__init__.py
src/testcase/test_tms_common/__pycache__/__init__.cpython-36.pyc → src/testcase/test_login/__pycache__/__init__.cpython-36.pyc
src/testcase/test_tms_common/__pycache__/test_Systemskip.cpython-36.pyc → src/testcase/test_login/__pycache__/test_Systemskip.cpython-36.pyc
@@ -27,13 +27,15 @@ class myrequest(object):
         return res  
  
     def post(self,url, data=None, json=None, **kwargs):
+        '''处理动态数据的方法'''
         log.info('{0:=^80}'.format('进行POST请求')) 
         log.info('请求地址为{};\n 请求body为{};\n'.format(url,data)) 
-        res = self.se.post(url, data=data, json=json,proxies=self.proxies,**kwargs)
+        res = self.se.post(url, data=data, json=json,**kwargs)
         log.info('响应body为{};'.format(res.json())) 
         return res
  
     def post2(self,session,api,**kwargs):
+        '''处理静态数据的方法'''
         self.se=session
         self.api=api.split("_")[2]
         self.api_num=(api.split("_")[2]+api.split("_")[1])
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+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"
+    header={
+            "Host": "test.trace.diligrp.com:8393",
+            "Connection": "keep-alive",
+            "Content-Length": "1378",
+            "Accept": "application/json,text/javascript,*/*;q=0.01",
+            "X-Requested-With": "XMLHttpRequest",
+            "User-Agent": "Mozilla/5.0(WindowsNT10.0;Win64;x64)AppleWebKit/537.36(KHTML,likeGecko)Chrome/91.0.4472.77Safari/537.36",
+            "Content-Type": "application/json",
+            "Origin": "http://test.trace.diligrp.com:8393",
+            "Referer": "http://test.trace.diligrp.com:8393/fieldConfig/bill.html",
+            "Accept-Encoding": "gzip,deflate",
+            "Accept-Language": "zh-CN,zh-TW;q=0.9,zh;q=0.8,en;q=0.7"}
+    
+    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=fieldConfig.url
+        self.header=fieldConfig.header
+        self.body=fieldConfig.body
+        
+    def post(self,name, password,**kwargs):
+        se=ll.get_session(name, password)
+        re=se.post(**kwargs)
+        ll.close_session()
+        return re
+       
+    def post2(self,session,name, password,**kwargs):
+        #直接传session，可以适配不用接口使用不同session的场景
+        se=ll.get_session(name, password)
+        re=session.post(**kwargs)
+        ll.close_session()
+        return re
+
+
+# tt=fieldConfig()
+# print(id(tt.body))
+# print(id(upStream.body))
+# tt.body["order"]=111
+# print(tt.body)
+# print(upStream.body)
+# print(id(tt.body))
+# print(id(upStream.body))
+# #深拷贝
+# t1=tt.body.copy()
+# print(id(t1))
+# print(id(tt.body))
+# t1["rows"]="666"
+# print(id(t1))
+# print(id(tt.body))
+# print(t1)
+# print(tt.body)
+
+# tt.post("sg_wenze", "111111",url=tt.url,headers=tt.header,json=tt.body,proxies={'http': 'http://localhost:8888'})
+
+# # print(tt.class_var)
+# # print(tt.login_url)
+# tt.demo("sg_wenze", "111111",proxies={'http': 'http://localhost:8888'})
@@ -6,7 +6,6 @@ import urllib3
 from commons import ConfigDB as db
 from commons import common as com
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
-from commons.MyRequest2 import myrequest
  
 #列表查询
 class login():
@@ -32,14 +31,7 @@ class login():
         self.header=login.header
         self.body=login.body
  
-    def get_session(self,name,password,**kwargs):
-        self.body=login.body.replace("sg_wenze", name)
-        self.body=login.body.replace("111111", password)
-        self.se=requests.session()
-        self.se.post(url=login.url, headers=login.header,data=login.body,**kwargs)
-        return self.se
-    
-    def get_session2(self,account,**kwargs):
+    def get_session(self,account,**kwargs):
         self.body=self.body.replace("sg_wenze", com.get_global_config("global_data", "account", account).split("&")[0])
         self.body=self.body.replace("111111", com.get_global_config("global_data", "account", account).split("&")[1])
         self.se=requests.session()
@@ -32,30 +32,16 @@ class upStream(login):
         self.url=upStream.url
         self.header=upStream.header
         self.body=upStream.body
-        
-#     def post(self,name, password,**kwargs):
-#         se=super().get_session(name, password)
-#         #用了super后，下面的变量直接变成父类的变量了，跳过子类了,因此导致post请求的时候用实例变量会错误
-# #         print(self.header)
-# #         print(self.body)
-#         se.post(url=upStream.url, headers=upStream.header,json=upStream.body,**kwargs)
-#         super().close_session()
  
-    def post(self,name, password,**kwargs):
-        se=ll.get_session(name, password)
-        #用了super后，下面的变量直接变成父类的变量了，跳过子类了
-#         re=se.post(url=self.url, headers=self.header,json=self.body,**kwargs)
+    def post(self,account,**kwargs):
+        se=ll.get_session(account)
         re=se.post(**kwargs)
         ll.close_session()
         return re
  
-       
-    def post2(self,session,name, password,**kwargs):
-        #直接传session，可以适配不用接口使用不同session的场景
-        se=ll.get_session(name, password)
-        print("post2",session)
-        #用了super后，下面的变量直接变成父类的变量了，跳过子类了
-#         re=se.post(url=self.url, headers=self.header,json=self.body,**kwargs)
+    def post2(self,session,account,**kwargs):
+        #解决不同接口对于不同用户的场景
+        se=ll.get_session(account)
         re=session.post(**kwargs)
         ll.close_session()
         return re
+# -*- coding: UTF-8 -*-
+[fieldConfig]
+method=post
+url=http://test.trace.diligrp.com:8393/fieldConfig/doUpdate.action
+body_format=JSON
+header={
+    "Host": "test.trace.diligrp.com",
+    "Connection": "keep-alive",
+    "Content-Length": "325",
+    "Accept": "application/json,text/javascript,*/*;q=0.01",
+    "X-Requested-With": "XMLHttpRequest",
+    "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/upStream/index.html",
+    "Accept-Encoding": "gzip,deflate",
+    "Accept-Language": "zh-CN,zh-TW;q=0.9,zh;q=0.8,en;q=0.7"}
+
+[fieldConfig01]
+body={"rows":10,"page":1,"sort":"id","order":"desc","metadata":{"created":"{\"provider\":\"datetimeProvider\",\"index\":10,\"field\":\"created\"}","upORdown":"{\"provider\":\"userFlagProvider\",\"index\":20,\"field\":\"upORdown\"}","upstreamType":"{\"provider\":\"upStreamTypeProvider\",\"index\":30,\"field\":\"upstreamType\"}"}}
+
+
+[fieldConfig02]
+body={"rows":10,"page":1,"sort":"id","order":"desc","metadata":{"created":"{\"provider\":\"datetimeProvider\",\"index\":10,\"field\":\"created\"}","upORdown":"{\"provider\":\"userFlagProvider\",\"index\":20,\"field\":\"upORdown\"}","upstreamType":"{\"provider\":\"upStreamTypeProvider\",\"index\":30,\"field\":\"upstreamType\"}"}}
+
+
+[fieldConfig03]
+body={"rows":10,"page":1,"sort":"id","order":"desc","metadata":{"created":"{\"provider\":\"datetimeProvider\",\"index\":10,\"field\":\"created\"}","upORdown":"{\"provider\":\"userFlagProvider\",\"index\":20,\"field\":\"upORdown\"}","upstreamType":"{\"provider\":\"upStreamTypeProvider\",\"index\":30,\"field\":\"upstreamType\"}"}}
+
+
+
+
+
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+import os,time
+import unittest
+import HTMLTestRunner_cn
+import commons.SendEmail as em
+
+
+if __name__ == "__main__":
+
+    #递归查询测试用例
+    listaa = "E:\\EclipseWorkspace\\WorksapceDemo\\Request-demo-dili\\src\\testcase"
+    def Create_Testcase_suite():
+        '''可以拓展该方法，为读取相对路径，然后传入指定文件测试用例：
+        Create_Testcase_suite(最顶层用例文件Case_Sences,下一级具体接口文件,)
+        '''
+        
+        testunit=unittest.TestSuite()
+        #discover会展示有多少test_*.py的文件,然后for依次添加这些文件夹下test_*.py里面的testcase
+        #这个方法会识别指定目录下所有test_*.py文件和test_*.py文件中所有class *(unittest.TestCase)以及其中的case
+        #每一个接口文件下面都得添加一个_init_.py不然无法识别该文件下的test_*.py
+        #_init_.py把所在目录当作一个package处理， from-import 语句导入子包时需要用到它。 如果没有用到, 他们可以是空文件
+        #如引入package.module下的所有模块from package.module import * 
+        #submitOrder文件下不加_init_.py时,test_submitOrder文件无法被搜索
+        discover=unittest.defaultTestLoader.discover(listaa,pattern='test_*.py',top_level_dir=None)
+        #dicover会按照class为一个单位把每一个文件下的每一个class单位下的所有用例都加载出来
+        print(discover)
+        for test_suite in discover:
+            testunit.addTests(test_suite)
+#             for test_case in test_suite:
+#                 testunit.addTests(test_case)
+#                 print(testunit)
+        return testunit
+    print(Create_Testcase_suite()) 
+    #创建测试报告
+#     now = time.strftime("%Y-%m-%d %H_%M_%S",time.localtime())
+#     filename="E:\\EclipseWorkspace\\WorksapceDemo\\Request-demo2\\src\\report\\"+now+"_result.html"
+#     fp=open(filename,'wb')
+#      
+#     runner=HTMLTestRunner_cn.HTMLTestRunner(
+#         stream=fp,
+#         title=u'搜索功能测试报告',
+#         description=u'用例执行情况：',
+#         verbosity = 2)
+#   
+#     runner.run(Create_Testcase_suite())
+
+
+#     #发送测试报告
+#     em.send_email(filename)
+# 
+#     fp.close()
+#     
+#     data = open(filename, 'r')
+#     print(data.read())
 \ No newline at end of file
@@ -14,7 +14,7 @@ uu=upStream()
 my=myrequest()
  
  
-class test_upStream(unittest.TestCase):
+class test_fieldConfig(unittest.TestCase):
     '''分别封装各个接口和数据，数据处理过程写入代码'''
     @classmethod
     def setUpClass(cls):
@@ -24,62 +24,10 @@ class test_upStream(unittest.TestCase):
     def setUp(self):
         pass
  
-    def test_01_upStream(self):
+    def test_01_fieldConfig(self):
         #成功查询上下游企业,无过滤条件---直接调用登陆类的方法，session可以保持一致
         #直接把接口和数据一起封装，测试时直接调用接口数据(请求数据没有修改的情况)
-        re=self.se.post(url=uu.url,headers=uu.header,json=uu.body)
-        print(re.json())
-        self.assertEqual(re.status_code, 200)
-
-    def test_02_upStream(self):
-        #成功查询上下游企业,加入企业/个人名称过滤条件----直接调用登陆类的方法，session可以保持一致
-        #直接把接口和数据一起封装，测试时直接调用接口数据(需要修改请求数据的情况)
-        body=uu.body.copy()
-        body["likeName"]="111"
-        print("test_02_upStream",body)
-        re=self.se.post(url=uu.url,headers=uu.header,json=uu.body)
-        print(re.json())
-        self.assertEqual(re.status_code, 200)
-        
-    def test_03_upStream(self):
-        #成功查询上下游企业,加入业户名称名称过滤条件---实验直接传session给接口类使用(封装使用)
-        re=uu.post2(self.se,"sg_wenze", "111111",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_04_upStream(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()
-
-
-
-class test_demo(unittest.TestCase):
-    '''提供一个封装好的公共方法，请求数据需求提前存储到配置文件'''
-    @classmethod
-    def setUpClass(cls):
-        #获取session
-        cls.se=ll.get_session("sg_wenze", "111111")
-        
-    def setUp(self):
         pass
-    
-    def test_01_demo(self):
-        #成功查询上下游企业,加入业户名称名称过滤条件
-        #使用公共的请求方法,数据需要单独维护
-        re=my.post2(self.se,"test_01_upStream")
-        print("test_01_upStream",re.json())
-        self.assertEqual(re.status_code, 200)
  
     def tearDown(self):
         print("tearDown")
@@ -91,19 +39,20 @@ class test_demo(unittest.TestCase):
  
  
  
+
 if __name__ == "__main__":
 #unittest.main()方法会搜索该模块文件下所有以test开头的测试用例方法，并自动执行它们。
 #如果不加下面这个语句，那么在通过unittest的方法添加测试用例时，这个文件里面的用例不会被搜索到。
  
-#     unittest.main(verbosity=2)
+    unittest.main(verbosity=2)
  
 # #    以下代码可以调试单个测试用例,用例中打印的语句不会展示到控制台,使用前需要注释上面的代码unittest.main(),如果不使用下面代码，
 # #    在有unittest.main()的情况下点击ctrl+f11,会直接运行当前页面所有用例，并且把用例用有打印的语句显示到控制台
-    current_suite = unittest.TestSuite()
-    current_suite.addTest(test_upStream("test_08_upStream"))
-#     #以列表形式添加多个测试用例
-# #     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
+#     current_suite = unittest.TestSuite()
+#     current_suite.addTest(test_upStream("test_08_upStream"))
+# #     #以列表形式添加多个测试用例
+# # #     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
@@ -13,37 +13,30 @@ ll=login()
 uu=upStream()
 my=myrequest()
  
-class test_upStream3(unittest.TestCase):
-    '''每个接口都单独提供一个登录方法'''
-    
+
+class test_login(unittest.TestCase):
+    '''分别封装各个接口和数据，数据处理过程写入代码'''
     @classmethod
     def setUpClass(cls):
-        pass    
+        #获取session
+        cls.se=ll.get_session("sg_wenze", "111111")
+        
     def setUp(self):
         pass
  
-    def test_01_upStream(self):
-        #成功查询上下游企业,加入企业/个人名称过滤条件----直接调用自己类的方法，session和其他用了可以不一致
-        #直接把接口和数据一起封装，测试时直接调用接口数据(需要修改请求数据的情况)
-        body=uu.body.copy()
-        body["likeName"]="111"
-        re=uu.post("sg_wenze", "111111",url=uu.url,headers=uu.header,json=body)
-        print(re.json())
-        self.assertEqual(re.status_code, 200)
-
-    def test_02_upStream(self):
-        #成功查询上下游企业,加入业户名称名称过滤条件----直接调用自己类的方法，session和其他用了可以不一致
-        body=uu.body.copy()
-        body["likeUserName"]="地利人和"
-        re=uu.post("sg_wenze", "111111",url=uu.url,headers=uu.header,json=body)
-        print(re.json())
-        self.assertEqual(re.status_code, 200)
+    def test_01_login(self):
+        #成功查询上下游企业,无过滤条件---直接调用登陆类的方法，session可以保持一致
+        #直接把接口和数据一起封装，测试时直接调用接口数据(请求数据没有修改的情况)
+        pass
  
     def tearDown(self):
-        pass
+        print("tearDown")
+           
     @classmethod
     def tearDownClass(cls):
-        pass
+        cls.se.close()
+
+
  
  
  
@@ -51,15 +44,15 @@ if __name__ == &quot;__main__&quot;:
 #unittest.main()方法会搜索该模块文件下所有以test开头的测试用例方法，并自动执行它们。
 #如果不加下面这个语句，那么在通过unittest的方法添加测试用例时，这个文件里面的用例不会被搜索到。
  
-#     unittest.main(verbosity=2)
+    unittest.main(verbosity=2)
  
 # #    以下代码可以调试单个测试用例,用例中打印的语句不会展示到控制台,使用前需要注释上面的代码unittest.main(),如果不使用下面代码，
 # #    在有unittest.main()的情况下点击ctrl+f11,会直接运行当前页面所有用例，并且把用例用有打印的语句显示到控制台
-    current_suite = unittest.TestSuite()
-    current_suite.addTest(test_upStream3("test_08_upStream"))
-#     #以列表形式添加多个测试用例
-# #     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
+#     current_suite = unittest.TestSuite()
+#     current_suite.addTest(test_upStream("test_08_upStream"))
+# #     #以列表形式添加多个测试用例
+# # #     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
-#!/usr/bin/python
-# -*- coding: UTF-8 -*-
-import unittest
-
-
-class test_setup_teardown1(unittest.TestCase):
-    
-    @classmethod
-    def setUpClass(cls):
-        print("setUpClass")
-
-    def setUp(self):
-        print("setup")
-    
-    def test_01(self):
-        print("test_01")
-        
-    def test_02(self):
-        print("test_02")
-    
-    def tearDown(self):
-        print("tearDown")
-        
-    @classmethod
-    def tearDownClass(cls):
-        print("tearDownClass")
-
-if __name__ == "__main__":
-#unittest.main()方法会搜索该模块文件下所有以test开头的测试用例方法，并自动执行它们。
-#如果不加下面这个语句，那么在通过unittest的方法添加测试用例时，这个文件里面的用例不会被搜索到。
-
-    unittest.main(verbosity=2)
-
-# #    以下代码可以调试单个测试用例,用例中打印的语句不会展示到控制台,使用前需要注释上面的代码unittest.main(),如果不使用下面代码，
-# #    在有unittest.main()的情况下点击ctrl+f11,会直接运行当前页面所有用例，并且把用例用有打印的语句显示到控制台
-#     current_suite = unittest.TestSuite()
-#     current_suite.addTest(submitOrder("test_01"))
-#     #以列表形式添加多个测试用例
-# #     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
-#!/usr/bin/python
-# -*- coding: UTF-8 -*-
-import unittest
-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 test_tms_common(unittest.TestCase):
-    
-    @classmethod
-    def setUpClass(cls):
-        cls.dict={}
-        cls.se=requests.session()
-        cls.proxies={'http': 'http://localhost:8888', 'https': 'http://localhost:8888'}
-        url=com.get_api_config('login', 'login01', 'url')
-        header=json.loads(com.get_api_config('login', 'login01', 'header'))
-        body=com.get_api_config('login', 'login01', 'body')
-        r=cls.se.post(url,data=body,headers=header,allow_redirects=False,proxies=cls.proxies)
-        print(r.status_code)
-    
-
-    def test_01_saveOrUpdate(self):
-        #创建客户单必加test_
-        url=com.get_api_config('saveOrUpdate', 'saveOrUpdate01', 'url')
-        header01=json.loads(com.get_api_config('saveOrUpdate', 'saveOrUpdate01', 'update_header01'))
-        header02=json.loads(com.get_api_config('saveOrUpdate', 'saveOrUpdate01', 'update_header02'))
-        body=json.loads(com.get_api_config('saveOrUpdate', 'saveOrUpdate01', 'body'))
-        self.se.headers.update(header01)
-        self.se.headers.update(header02)
-        r=self.se.post(url,data=body,allow_redirects=False,proxies=self.proxies)
-        print(r.json())
-        self.dict["customerOrderNum"]=db.mysql_selectOne("SELECT `code` FROM `customer_order` WHERE id='%d';"%r.json()['data'])[0]
-        
-    @unittest.skipDepend(depend="test_01_saveOrUpdate")
-    def test_02_customerOrderSubmit(self):
-        #客户单拆单为承运单
-        url=com.get_api_config('customerOrderSubmit', 'customerOrderSubmit01', 'url')
-        header01=json.loads(com.get_api_config('customerOrderSubmit', 'customerOrderSubmit01', 'update_header01'))
-        body=json.loads(com.get_api_config('customerOrderSubmit', 'customerOrderSubmit01', 'body'))
-        body[0]["code"]=self.dict["customerOrderNum"]
-        body[1]["code"]=self.dict["customerOrderNum"]
-        self.se.headers.update(header01)
-        r=self.se.post(url,data=json.dumps(body),allow_redirects=False,proxies=self.proxies)
-        print(r.json())
-        self.dict["undertakeOrderID1"]=db.mysql_selectOne('SELECT id FROM `undertake_order` WHERE `code` ="%s";'%r.json()['data'][0])[0]
-        self.dict["undertakeOrderID2"]=db.mysql_selectOne('SELECT id FROM `undertake_order` WHERE `code` ="%s";'%r.json()['data'][1])[0]
-        print(self.dict)
-    
-    @unittest.skipDepend(depend="test_02_customerOrderSubmit")
-    def test_03_undertaskOrderSubmit(self):
-        #承运单合成货单
-        url=com.get_api_config('undertaskOrderSubmit', 'undertaskOrderSubmit01', 'url')
-        header01=json.loads(com.get_api_config('undertaskOrderSubmit', 'undertaskOrderSubmit01', 'update_header01'))
-        body=json.loads(com.get_api_config('undertaskOrderSubmit', 'undertaskOrderSubmit01', 'body'))
-        body['ids'][1]=self.dict["undertakeOrderID1"]
-        body['ids'][2]=self.dict["undertakeOrderID2"]
-        self.se.headers.update(header01)
-        r=self.se.post(url,data=json.dumps(body),allow_redirects=False,proxies=self.proxies)
-        print(r.json())
-        self.dict["transportOrderID"]=db.mysql_selectOne("SELECT `id` FROM `transport_order` WHERE firm_code = 'CC201905200058' ORDER BY id DESC LIMIT 1;")[0]
-        self.dict["undertakeGoodsID"]=db.mysql_selectOne("SELECT `id` FROM undertake_goods ORDER BY id DESC LIMIT 1;")[0]
-    
-    @unittest.skipDepend(depend="test_03_undertaskOrderSubmit")
-    def test_04_updateTransportOrderLoaded(self):
-        #货单进行发货
-        url=com.get_api_config('updateTransportOrderLoaded', 'updateTransportOrderLoaded01', 'url')
-        header01=json.loads(com.get_api_config('updateTransportOrderLoaded', 'updateTransportOrderLoaded01', 'update_header01'))
-        body=json.loads(com.get_api_config('updateTransportOrderLoaded', 'updateTransportOrderLoaded01', 'body'))
-        body['id']=self.dict["transportOrderID"]
-        body['undertTakeGoodsUpdateDtoList[0].goodsId']=(self.dict["undertakeGoodsID"]-1)
-        body['undertTakeGoodsUpdateDtoList[1].goodsId']=self.dict["undertakeGoodsID"]
-        self.se.headers.update(header01)
-        r=self.se.post(url,data=body,allow_redirects=False,proxies=self.proxies)
-        print(r.json())
-
-    @unittest.skipDepend(depend="test_04_updateTransportOrderLoaded")
-    def test_05_departTransportOrder(self):
-        #货单进行发车
-        url=com.get_api_config('departTransportOrder', 'departTransportOrder01', 'url')
-        body=json.loads(com.get_api_config('departTransportOrder', 'departTransportOrder01', 'body'))
-        body['id']=self.dict["transportOrderID"]
-        r=self.se.post(url,data=body,allow_redirects=False,proxies=self.proxies)
-        print(r.json())
-        print(body,type(body))
-#     def tearDown(self):
-#         print("tearDown")
-        
-    @classmethod
-    def tearDownClass(cls):
-        print(cls.dict)
-
-if __name__ == "__main__":
-#unittest.main()方法会搜索该模块文件下所有以test开头的测试用例方法，并自动执行它们。
-#如果不加下面这个语句，那么在通过unittest的方法添加测试用例时，这个文件里面的用例不会被搜索到。
-
-    unittest.main(verbosity=2)
-
-# #    以下代码可以调试单个测试用例,用例中打印的语句不会展示到控制台,使用前需要注释上面的代码unittest.main(),如果不使用下面代码，
-# #    在有unittest.main()的情况下点击ctrl+f11,会直接运行当前页面所有用例，并且把用例用有打印的语句显示到控制台
-#     current_suite = unittest.TestSuite()
-#     current_suite.addTest(submitOrder("test_01"))
-#     #以列表形式添加多个测试用例
-# #     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
-#!/usr/bin/python
-# -*- coding: UTF-8 -*-
-import unittest
-import json
-import urllib3
-from commons import ConfigDB as db
-from commons import common as com
-from commons.MyRequest import myrequest 
-urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
-my=myrequest()
-
-
-class test_tms_myrequest(unittest.TestCase):
-    
-    @classmethod
-    def setUpClass(cls):
-        cls.dict={}
-        cls.se=my.getSession(True)
-
-#     @unittest.skip("debug")
-    def test_01_saveOrUpdate(self):
-        #创建客户单必加test_
-        url=com.get_api_config('saveOrUpdate', 'saveOrUpdate01', 'url')
-        header01=json.loads(com.get_api_config('saveOrUpdate', 'saveOrUpdate01', 'update_header01'))
-        header02=json.loads(com.get_api_config('saveOrUpdate', 'saveOrUpdate01', 'update_header02'))
-        body=json.loads(com.get_api_config('saveOrUpdate', 'saveOrUpdate01', 'body'))
-        expect_response=json.loads(com.get_api_config('saveOrUpdate', 'saveOrUpdate01', 'expect_response'))
-        self.se.headers.update(header01)
-        self.se.headers.update(header02)
-        r=my.post(url,data=body,allow_redirects=False)
-        self.assertEqual(r.json()["code"], "200","first request failed")
-        self.assertEqual(com.compare_json(r.json(),expect_response),None,"json compare failed")
-        print(r.json())
-        self.dict["customerOrderNum"]=db.mysql_selectOne("SELECT `code` FROM `customer_order` WHERE id='%d';"%r.json()['data'])[0]
-
-        
-    @unittest.skipDepend(depend="test_01_saveOrUpdate")
-    def test_02_customerOrderSubmit(self):
-        #客户单拆单为承运单
-        url=com.get_api_config('customerOrderSubmit', 'customerOrderSubmit01', 'url')
-        header01=json.loads(com.get_api_config('customerOrderSubmit', 'customerOrderSubmit01', 'update_header01'))
-        body=json.loads(com.get_api_config('customerOrderSubmit', 'customerOrderSubmit01', 'body'))
-        body[0]["code"]=self.dict["customerOrderNum"]
-        body[1]["code"]=self.dict["customerOrderNum"]
-        self.se.headers.update(header01)
-        r=my.post(url,data=json.dumps(body))
-        self.assertEqual(r.json()["code"], "200")
-        print(r.json())
-        self.dict["undertakeOrderID1"]=db.mysql_selectOne('SELECT id FROM `undertake_order` WHERE `code` ="%s";'%r.json()['data'][0])[0]
-        self.dict["undertakeOrderID2"]=db.mysql_selectOne('SELECT id FROM `undertake_order` WHERE `code` ="%s";'%r.json()['data'][1])[0]
-        print(self.dict)
-        
-    @unittest.skipDepend(depend="test_02_customerOrderSubmit")
-    def test_03_undertaskOrderSubmit(self):
-        #承运单合成货单
-        url=com.get_api_config('undertaskOrderSubmit', 'undertaskOrderSubmit01', 'url')
-        header01=json.loads(com.get_api_config('undertaskOrderSubmit', 'undertaskOrderSubmit01', 'update_header01'))
-        body=json.loads(com.get_api_config('undertaskOrderSubmit', 'undertaskOrderSubmit01', 'body'))
-        body['ids'][1]=self.dict["undertakeOrderID1"]
-        body['ids'][2]=self.dict["undertakeOrderID2"]
-        self.se.headers.update(header01)
-        r=my.post(url,data=json.dumps(body))
-        self.assertEqual(r.json()["code"], "200")
-        print(r.json())
-        self.dict["transportOrderID"]=db.mysql_selectOne("SELECT `id` FROM `transport_order` WHERE firm_code = 'CC201905200058' ORDER BY id DESC LIMIT 1;")[0]
-        self.dict["undertakeGoodsID"]=db.mysql_selectOne("SELECT `id` FROM undertake_goods ORDER BY id DESC LIMIT 1;")[0]
-    
-    @unittest.skipDepend(depend="test_03_undertaskOrderSubmit")
-    def test_04_updateTransportOrderLoaded(self):
-        #货单进行发货
-        url=com.get_api_config('updateTransportOrderLoaded', 'updateTransportOrderLoaded01', 'url')
-        header01=json.loads(com.get_api_config('updateTransportOrderLoaded', 'updateTransportOrderLoaded01', 'update_header01'))
-        body=json.loads(com.get_api_config('updateTransportOrderLoaded', 'updateTransportOrderLoaded01', 'body'))
-        body['id']=self.dict["transportOrderID"]
-        body['undertTakeGoodsUpdateDtoList[0].goodsId']=(self.dict["undertakeGoodsID"]-1)
-        body['undertTakeGoodsUpdateDtoList[1].goodsId']=self.dict["undertakeGoodsID"]
-        self.se.headers.update(header01)
-        r=my.post(url,data=body)
-        self.assertEqual(r.json()["code"], "200")
-        print(r.json())
-        
-    @unittest.skipDepend(depend="test_04_updateTransportOrderLoaded")
-    def test_05_departTransportOrder(self):
-        #货单进行发车
-        url=com.get_api_config('departTransportOrder', 'departTransportOrder01', 'url')
-        body=json.loads(com.get_api_config('departTransportOrder', 'departTransportOrder01', 'body'))
-        body['id']=self.dict["transportOrderID"]
-        r=my.post(url,data=body)
-        self.assertEqual(r.json()["code"], "200")
-        print(r.json())
-
-    @unittest.skipDepend(depend="test_05_departTransportOrder")
-    def test_06_arrivalUnderTakeOrder(self):
-        #货单1到货登记
-        url=com.get_api_config('arrivalUnderTakeOrder', 'arrivalUnderTakeOrder01', 'url')
-        url_dict=com.get_to_post(url)
-        url_dict[[key for key in url_dict.keys() if "code" in key][0]]= db.mysql_selectOne("SELECT `code` FROM `undertake_order` where id ={};".format(self.dict["undertakeOrderID1"]))[0]
-        url=com.post_to_get(url_dict)
-        r=my.get(url)
-        self.assertEqual(r.json()["code"], "200")
-        print(r.json())
-
-    @unittest.skipDepend(depend="test_06_arrivalUnderTakeOrder")
-    def test_07_arrivalUnderTakeOrder(self):
-        #货单2到货登记
-        url=com.get_api_config('arrivalUnderTakeOrder', 'arrivalUnderTakeOrder01', 'url')
-        url_dict=com.get_to_post(url)
-        url_dict[[key for key in url_dict.keys() if "code" in key][0]]= db.mysql_selectOne("SELECT `code` FROM `undertake_order` where id ={};".format(self.dict["undertakeOrderID2"]))[0]
-        url=com.post_to_get(url_dict)
-        r=my.get(url)
-        self.assertEqual(r.json()["code"], "200")
-        print(r.json())
-   
-   
-#     def tearDown(self):
-#         print("tearDown")
-        
-    @classmethod
-    def tearDownClass(cls):
-        print(cls.dict)
-        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(submitOrder("test_01"))
-#     #以列表形式添加多个测试用例
-# #     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
@@ -14,47 +14,85 @@ uu=upStream()
 my=myrequest()
  
 #列表查询
-class test_upStream2(unittest.TestCase):
+class test_upStream1(unittest.TestCase):
  
     @classmethod
     def setUpClass(cls):
         #新增登记单
-        cls.se=ll.get_session2("user01")
+        cls.se=ll.get_session("user01")
  
     def setUp(self):
         pass
  
-    def test_01_upStream(self):
-        #成功查询上下游企业,无过滤条件---直接调用登陆类的方法，session可以保持一致
-        #直接把接口和数据一起封装，测试时直接调用接口数据(请求数据没有修改的情况)
+    def test_01_upStream1(self):
+        #成功查询上下游企业,无过滤条件
         re=self.se.post(url=uu.url,headers=uu.header,json=uu.body)
         print(re.json())
         self.assertEqual(re.status_code, 200)
  
-    def test_02_upStream(self):
-        #成功查询上下游企业,加入企业/个人名称过滤条件----直接调用登陆类的方法，session可以保持一致
-        #直接把接口和数据一起封装，测试时直接调用接口数据(需要修改请求数据的情况)
+    def test_02_upStream1(self):
+        #成功查询上下游企业,加入企业/个人名称过滤条件
         body=uu.body.copy()
         body["likeName"]="111"
         print("test_02_upStream",body)
         re=self.se.post(url=uu.url,headers=uu.header,json=uu.body)
         print(re.json())
         self.assertEqual(re.status_code, 200)
-        
-    def test_03_upStream(self):
-        #成功查询上下游企业,加入业户名称名称过滤条件---实验直接传session给接口类使用(封装使用)
-        re=uu.post2(self.se,"sg_wenze", "111111",url=uu.url,headers=uu.header,json=uu.body)
-        print("test_03_upStream",re.json())
+
+#     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)
+
+
+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_04_upStream(self):
+
+    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)
+        print(re.json())
+        self.assertEqual(re.status_code, 200)
+
+    def test_03_upStream2(self):
         #成功查询上下游企业,加入业户名称名称过滤条件
-        #使用公共的请求方法,数据需要单独维护
-        re=my.post2(self.se,"test_01_upStream")
-        print("test_04_upStream",re.json())
+        body=uu.body.copy()
+        body["likeUserName"]="地利人和"
+        re=uu.post("sg_wenze", "111111",url=uu.url,headers=uu.header,json=body)
+        print(re.json())
         self.assertEqual(re.status_code, 200)
  
+
+#     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")
  
@@ -72,7 +110,7 @@ if __name__ == &quot;__main__&quot;:
 # #    以下代码可以调试单个测试用例,用例中打印的语句不会展示到控制台,使用前需要注释上面的代码unittest.main(),如果不使用下面代码，
 # #    在有unittest.main()的情况下点击ctrl+f11,会直接运行当前页面所有用例，并且把用例用有打印的语句显示到控制台
     current_suite = unittest.TestSuite()
-    current_suite.addTest(test_upStream2("test_01_upStream"))
+    current_suite.addTest(test_upStream1("test_01_upStream1"))
 #     #以列表形式添加多个测试用例
 # #     current_suite.addTests([submitOrder_With_Coupon("test_01"),submitOrder_With_Coupon("test_02")])
 #     # 执行测试