Merge remote-tracking branch 'origin/master'

wenleiming
2 parents 55429fd2 413ebc24
Showing 6 changed files with 72 additions and 5 deletions
commons/api/duplicateToken.py
commons/api/weighingServiceSave.py
commons/basic/__init__.py
commons/basic/listCarType.py
config/global_data.conf
testcase/weightBizBill/test_weighingServiceSave.py
@@ -24,10 +24,9 @@ class duplicateToken():
         self.header["Host"] = com.get_global_config("global_data", "host", "gateway")
  
     def jmsf_duplicate_commit_token(self):
-        re = sy1.get(url=self.url, headers=self.header,proxies=my.myproxies)
+        re = sy1.get(url=self.url, headers=self.header)
         return re.json()["data"]
  
  
 # du=duplicateToken()
-# du.jmsf_duplicate_commit_token()
 # print(du.jmsf_duplicate_commit_token())
@@ -53,6 +53,7 @@ class weighingServiceSave():
  
  
  
+
 # tt=weighingServiceSave()
 # re=sy1.post(url=tt.url,headers=tt.header,json=tt.body,proxies=my.myproxies)
-# # print(re.json())
 \ No newline at end of file
+# print(re.json())
 \ No newline at end of file
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+import urllib3
+from commons import common as com
+from commons.MySession import my,sy1,sy2
+urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
+
+
+class listCarType():
+    url = "http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCarType"
+    header = {
+            "UAP_accessToken": "demo",
+            "UAP_refreshToken": "demo",
+            "UAP_firmId": "9",
+            "Content-Type": "application/json",
+            "Host": "test.gateway.diligrp.com:8285",
+            "Content-Length": "23"}
+    body = {"businessCode":"jmsf"}
+
+    def __init__(self):
+        self.url = listCarType.url.replace("http://test.", com.get_global_config("global_data", "environment", "en"))
+        self.header = listCarType.header
+        self.header["UAP_accessToken"] = sy1.cookies["UAP_accessToken"]
+        self.header["UAP_refreshToken"] = sy1.cookies["UAP_refreshToken"]
+        self.header["UAP_firmId"] = sy1.cookies["UAP_firmId"]
+        self.header["Host"] = com.get_global_config("global_data", "host", "gateway")
+
+    def car_list(self):
+        re = sy1.post(url=self.url, headers=self.header,json=self.body)
+        return re.json()
+
+# tt=listCarType()
+# print(tt.car_list())
 \ No newline at end of file
@@ -21,8 +21,8 @@ demo=[&quot;tg@diligrp.com&quot;,&quot;175930106@qq.com&quot;]
  
 [mark]
 #为空时[]运行所有用例,若要运行指定用例，参考demo
-list=["heb1","P3","v1.6","沈阳"]
-demo=["p1","P2",1,"test"]
+list=[]
+demo=["heb1","P3","v1.6","沈阳",None]
  
  
 [environment]
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+import unittest
+import urllib3
+from commons.MySession import my,sy1
+from commons.api.weighingServiceSave import weighingServiceSave
+from commons.basic.listCarType import listCarType
+urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
+we=weighingServiceSave()
+li=listCarType()
+
+
+
+class test_weighingServiceSave(unittest.TestCase):
+    "称重服务"
+
+    @unittest.case_mark(my.mark())
+    def test_weighingServiceSave_01(self):
+        "称重服务-称重服务：成功新增一条称重服务单"
+        body=we.body.copy()
+        body["carTypeId"]=li.car_list()["data"][0]["id"]
+        body["carTypeName"]=li.car_list()["data"][0]["carTypeName"]
+        body["carTypeCode"]=li.car_list()["data"][0]["code"]
+        re=sy1.post(url=we.url,headers=we.header,json=body)
+        print(re.json())
+        self.assertEqual(re.status_code, 200)
+        self.assertTrue("'message':'交费成功','result':'交费成功','success':True" in str(re.json()).replace(" ",""))
+
+
+if __name__ == "__main__":
+
+    unittest.main(verbosity=2)
+
+    # com.run_one(test_weighingServiceSave("test_weighingServiceSave_01"))