Commit 83d19a0f4e61e64a0cabf9b2e54feaa7be12a358
1 parent
be229ed3
更新层级
Showing
78 changed files
with
88 additions
and
86 deletions
commons/api/sy/entranceFeeBillList/__init__.py renamed to commons/api/entranceFeeBillList/__init__.py
commons/api/sy/entranceFeeBillList/apiDemo.py renamed to commons/api/entranceFeeBillList/apiDemo.py
commons/api/sy/entranceFeeBillList/entranceFeeBillList.py renamed to commons/api/entranceFeeBillList/entranceFeeBillList.py
commons/api/sy/entranceFeeBillList/operationDoAmend.py renamed to commons/api/entranceFeeBillList/operationDoAmend.py
| @@ -12,7 +12,7 @@ | @@ -12,7 +12,7 @@ | ||
| 12 | import json,time, re | 12 | import json,time, re |
| 13 | from commons.scripts import dealContentType as dct | 13 | from commons.scripts import dealContentType as dct |
| 14 | from commons.scripts import jsonToUrlcode | 14 | from commons.scripts import jsonToUrlcode |
| 15 | -from commons.api.sy.entranceFeeBillList import entranceFeeBillList as eFBL | 15 | +from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL |
| 16 | from bs4 import BeautifulSoup | 16 | from bs4 import BeautifulSoup |
| 17 | import urllib.parse | 17 | import urllib.parse |
| 18 | 18 |
commons/api/sy/entranceFeeBillList/operationDoCorrect.py renamed to commons/api/entranceFeeBillList/operationDoCorrect.py
| @@ -12,7 +12,7 @@ | @@ -12,7 +12,7 @@ | ||
| 12 | import json,time,random,re | 12 | import json,time,random,re |
| 13 | from commons.scripts import dealContentType as dct | 13 | from commons.scripts import dealContentType as dct |
| 14 | from commons.scripts import jsonToUrlcode | 14 | from commons.scripts import jsonToUrlcode |
| 15 | -from commons.api.sy.entranceFeeBillList import entranceFeeBillList as eFBL | 15 | +from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL |
| 16 | from bs4 import BeautifulSoup | 16 | from bs4 import BeautifulSoup |
| 17 | import urllib.parse | 17 | import urllib.parse |
| 18 | 18 |
commons/api/sy/entranceFeeBillList/operationDoFreeze.py renamed to commons/api/entranceFeeBillList/operationDoFreeze.py
| @@ -12,7 +12,7 @@ | @@ -12,7 +12,7 @@ | ||
| 12 | import json,time, re | 12 | import json,time, re |
| 13 | from commons.scripts import dealContentType as dct | 13 | from commons.scripts import dealContentType as dct |
| 14 | from commons.scripts import jsonToUrlcode | 14 | from commons.scripts import jsonToUrlcode |
| 15 | -from commons.api.sy.entranceFeeBillList import entranceFeeBillList as eFBL | 15 | +from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL |
| 16 | from bs4 import BeautifulSoup | 16 | from bs4 import BeautifulSoup |
| 17 | import urllib.parse | 17 | import urllib.parse |
| 18 | 18 |
commons/api/sy/entranceFeeBillList/operationDoInvalid.py renamed to commons/api/entranceFeeBillList/operationDoInvalid.py
| @@ -12,7 +12,7 @@ | @@ -12,7 +12,7 @@ | ||
| 12 | import json,time, re | 12 | import json,time, re |
| 13 | from commons.scripts import dealContentType as dct | 13 | from commons.scripts import dealContentType as dct |
| 14 | from commons.scripts import jsonToUrlcode | 14 | from commons.scripts import jsonToUrlcode |
| 15 | -from commons.api.sy.entranceFeeBillList import entranceFeeBillList as eFBL | 15 | +from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL |
| 16 | from bs4 import BeautifulSoup | 16 | from bs4 import BeautifulSoup |
| 17 | import urllib.parse | 17 | import urllib.parse |
| 18 | 18 |
commons/api/sy/entranceFeeBillList/operationDoUndo.py renamed to commons/api/entranceFeeBillList/operationDoUndo.py
| @@ -12,7 +12,7 @@ | @@ -12,7 +12,7 @@ | ||
| 12 | import json, re | 12 | import json, re |
| 13 | from commons.scripts import dealContentType as dct | 13 | from commons.scripts import dealContentType as dct |
| 14 | from commons.scripts import jsonToUrlcode | 14 | from commons.scripts import jsonToUrlcode |
| 15 | -from commons.api.sy.entranceFeeBillList import entranceFeeBillList as eFBL | 15 | +from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL |
| 16 | from bs4 import BeautifulSoup | 16 | from bs4 import BeautifulSoup |
| 17 | import urllib.parse | 17 | import urllib.parse |
| 18 | 18 |
commons/api/sy/entranceFeeBillList/operationDoUpdate.py renamed to commons/api/entranceFeeBillList/operationDoUpdate.py
| @@ -13,7 +13,7 @@ import json,time, re | @@ -13,7 +13,7 @@ import json,time, re | ||
| 13 | from commons.scripts import dealContentType as dct | 13 | from commons.scripts import dealContentType as dct |
| 14 | from commons.scripts import jsonToUrlcode | 14 | from commons.scripts import jsonToUrlcode |
| 15 | # from commons.MySession import my | 15 | # from commons.MySession import my |
| 16 | -from commons.api.sy.entranceFeeBillList import entranceFeeBillList as eFBL | 16 | +from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL |
| 17 | from bs4 import BeautifulSoup | 17 | from bs4 import BeautifulSoup |
| 18 | import urllib.parse | 18 | import urllib.parse |
| 19 | 19 |
commons/api/sy/entranceFeeBillList/operationUnfreeze.py renamed to commons/api/entranceFeeBillList/operationUnfreeze.py
| @@ -12,7 +12,7 @@ | @@ -12,7 +12,7 @@ | ||
| 12 | import json,time, re | 12 | import json,time, re |
| 13 | from commons.scripts import dealContentType as dct | 13 | from commons.scripts import dealContentType as dct |
| 14 | from commons.scripts import jsonToUrlcode | 14 | from commons.scripts import jsonToUrlcode |
| 15 | -from commons.api.sy.entranceFeeBillList import entranceFeeBillList as eFBL | 15 | +from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL |
| 16 | from bs4 import BeautifulSoup | 16 | from bs4 import BeautifulSoup |
| 17 | import urllib.parse | 17 | import urllib.parse |
| 18 | 18 |
commons/api/sy/entranceFeeBill_details.py renamed to commons/api/entranceFeeBill_details.py
commons/api/sy/entranceFeeBill_provesPage.py renamed to commons/api/entranceFeeBill_provesPage.py
commons/api/sy/fc_add.py renamed to commons/api/fc_add.py
commons/api/sy/fc_edit.py renamed to commons/api/fc_edit.py
commons/api/sy/fc_view.py renamed to commons/api/fc_view.py
commons/api/sy/feedbackAccounrecordController_list.py renamed to commons/api/feedbackAccounrecordController_list.py
commons/api/sy/feedbackOrderController_querySumAmount.py renamed to commons/api/feedbackOrderController_querySumAmount.py
commons/api/sy/feedbackOrderController_settlementlist.py renamed to commons/api/feedbackOrderController_settlementlist.py
commons/api/sy/feedback_customer_disable.py renamed to commons/api/feedback_customer_disable.py
commons/api/sy/feedback_customer_enable.py renamed to commons/api/feedback_customer_enable.py
commons/api/sy/feedback_customer_query.py renamed to commons/api/feedback_customer_query.py
commons/api/sy/feedback_order_settlement.py renamed to commons/api/feedback_order_settlement.py
commons/api/sy/feedback_order_settlement_query.py renamed to commons/api/feedback_order_settlement_query.py
commons/api/sy/hpApi.py renamed to commons/api/hpApi.py
| @@ -11,7 +11,7 @@ | @@ -11,7 +11,7 @@ | ||
| 11 | 11 | ||
| 12 | import json,time,random | 12 | import json,time,random |
| 13 | from commons.scripts import dealContentType as dct | 13 | from commons.scripts import dealContentType as dct |
| 14 | -from commons.api.sy import zcApi | 14 | +from commons.api import zcApi |
| 15 | 15 | ||
| 16 | host = "http://test.gateway.diligrp.com:8285" | 16 | host = "http://test.gateway.diligrp.com:8285" |
| 17 | 17 |
commons/api/sy/sjApi.py renamed to commons/api/sjApi.py
| @@ -11,7 +11,7 @@ | @@ -11,7 +11,7 @@ | ||
| 11 | 11 | ||
| 12 | import json | 12 | import json |
| 13 | from commons.scripts import dealContentType as dct | 13 | from commons.scripts import dealContentType as dct |
| 14 | -from commons.api.sy import zcApi | 14 | +from commons.api import zcApi |
| 15 | from commons.basic import getLookupList as gLL | 15 | from commons.basic import getLookupList as gLL |
| 16 | 16 | ||
| 17 | 17 |
commons/api/sy/weighingServiceSave.py renamed to commons/api/weighingServiceSave.py
commons/api/sy/weightBizBill_doRefund.py renamed to commons/api/weightBizBill_doRefund.py
commons/api/sy/weightBizBill_listPage.py renamed to commons/api/weightBizBill_listPage.py
commons/api/sy/zcApi.py renamed to commons/api/zcApi.py
testcase/heb/CZFW/test_weightBizBill_doRefund.py
| @@ -4,8 +4,8 @@ import unittest | @@ -4,8 +4,8 @@ import unittest | ||
| 4 | import urllib3 | 4 | import urllib3 |
| 5 | from commons import ConfigDB as db | 5 | from commons import ConfigDB as db |
| 6 | from commons.MySession import my,heb | 6 | from commons.MySession import my,heb |
| 7 | -from commons.api.sy.weightBizBill_doRefund import weightBizBill_doRefund | ||
| 8 | -from commons.api.sy.weighingServiceSave import weighingServiceSave | 7 | +from commons.api.weightBizBill_doRefund import weightBizBill_doRefund |
| 8 | +from commons.api.weighingServiceSave import weighingServiceSave | ||
| 9 | from commons.basic.listCarType import listCarType | 9 | from commons.basic.listCarType import listCarType |
| 10 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) | 10 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) |
| 11 | do=weightBizBill_doRefund() | 11 | do=weightBizBill_doRefund() |
testcase/heb/CZFW/test_weightBizBill_listPage.py
| @@ -4,8 +4,8 @@ import unittest | @@ -4,8 +4,8 @@ import unittest | ||
| 4 | import urllib3 | 4 | import urllib3 |
| 5 | import time | 5 | import time |
| 6 | from commons.MySession import my,heb | 6 | from commons.MySession import my,heb |
| 7 | -from commons.api.sy.weightBizBill_listPage import weightBizBill_listPage | ||
| 8 | -from commons.api.sy.weighingServiceSave import weighingServiceSave | 7 | +from commons.api.weightBizBill_listPage import weightBizBill_listPage |
| 8 | +from commons.api.weighingServiceSave import weighingServiceSave | ||
| 9 | from commons.basic.listCarType import listCarType | 9 | from commons.basic.listCarType import listCarType |
| 10 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) | 10 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) |
| 11 | bi=weightBizBill_listPage() | 11 | bi=weightBizBill_listPage() |
testcase/heb/FeedbackCustomerController/test_fc_add.py
| 1 | import unittest | 1 | import unittest |
| 2 | import urllib3 | 2 | import urllib3 |
| 3 | from commons.MySession import heb | 3 | from commons.MySession import heb |
| 4 | -from commons.api.sy.fc_add import fc_add | 4 | +from commons.api.fc_add import fc_add |
| 5 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) | 5 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) |
| 6 | from commons.Faker import random_data | 6 | from commons.Faker import random_data |
| 7 | import commons.ConfigDB as db | 7 | import commons.ConfigDB as db |
testcase/heb/FeedbackCustomerController/test_fc_edit.py
| 1 | import unittest | 1 | import unittest |
| 2 | import urllib3 | 2 | import urllib3 |
| 3 | from commons.MySession import heb | 3 | from commons.MySession import heb |
| 4 | -from commons.api.sy.fc_edit import fc_edit | 4 | +from commons.api.fc_edit import fc_edit |
| 5 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) | 5 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) |
| 6 | from commons.Faker import random_data | 6 | from commons.Faker import random_data |
| 7 | -from commons.api.sy.fc_add import fc_add | 7 | +from commons.api.fc_add import fc_add |
| 8 | ra = random_data() | 8 | ra = random_data() |
| 9 | fca = fc_add() | 9 | fca = fc_add() |
| 10 | import commons.ConfigDB as db | 10 | import commons.ConfigDB as db |
testcase/heb/FeedbackCustomerController/test_fc_view.py
| @@ -2,8 +2,8 @@ import unittest | @@ -2,8 +2,8 @@ import unittest | ||
| 2 | import urllib3 | 2 | import urllib3 |
| 3 | import commons.ConfigDB as db | 3 | import commons.ConfigDB as db |
| 4 | from commons.MySession import heb | 4 | from commons.MySession import heb |
| 5 | -from commons.api.sy.fc_view import fc_view | ||
| 6 | -from commons.api.sy.fc_add import fc_add | 5 | +from commons.api.fc_view import fc_view |
| 6 | +from commons.api.fc_add import fc_add | ||
| 7 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) | 7 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) |
| 8 | ad = fc_add() | 8 | ad = fc_add() |
| 9 | vi = fc_view() | 9 | vi = fc_view() |
testcase/heb/FeedbackCustomerController/test_feedback_customer_disable.py
| 1 | import unittest | 1 | import unittest |
| 2 | import urllib3 | 2 | import urllib3 |
| 3 | from commons.MySession import heb | 3 | from commons.MySession import heb |
| 4 | -from commons.api.sy.feedback_customer_disable import feedback_customer_disable | 4 | +from commons.api.feedback_customer_disable import feedback_customer_disable |
| 5 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) | 5 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) |
| 6 | fcd = feedback_customer_disable() | 6 | fcd = feedback_customer_disable() |
| 7 | import commons.ConfigDB as db | 7 | import commons.ConfigDB as db |
testcase/heb/FeedbackCustomerController/test_feedback_customer_enable.py
| 1 | import unittest | 1 | import unittest |
| 2 | import urllib3 | 2 | import urllib3 |
| 3 | from commons.MySession import heb | 3 | from commons.MySession import heb |
| 4 | -from commons.api.sy.feedback_customer_enable import feedback_customer_enable | ||
| 5 | -from commons.api.sy.feedback_customer_disable import feedback_customer_disable | 4 | +from commons.api.feedback_customer_enable import feedback_customer_enable |
| 5 | +from commons.api.feedback_customer_disable import feedback_customer_disable | ||
| 6 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) | 6 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) |
| 7 | fce = feedback_customer_enable() | 7 | fce = feedback_customer_enable() |
| 8 | fcd = feedback_customer_disable | 8 | fcd = feedback_customer_disable |
testcase/heb/FeedbackCustomerController/test_feedback_customer_query.py
| 1 | import unittest | 1 | import unittest |
| 2 | import urllib3 | 2 | import urllib3 |
| 3 | from commons.MySession import heb | 3 | from commons.MySession import heb |
| 4 | -from commons.api.sy.feedback_customer_query import feedback_customer_query | 4 | +from commons.api.feedback_customer_query import feedback_customer_query |
| 5 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) | 5 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) |
| 6 | import datetime | 6 | import datetime |
| 7 | import commons.ConfigDB as db | 7 | import commons.ConfigDB as db |
testcase/heb/FeedbackOrderController/test_feedback_order_settlement.py
| 1 | import unittest | 1 | import unittest |
| 2 | import urllib3 | 2 | import urllib3 |
| 3 | from commons.MySession import heb | 3 | from commons.MySession import heb |
| 4 | -from commons.api.sy.feedback_order_settlement import feedback_order_settlement | 4 | +from commons.api.feedback_order_settlement import feedback_order_settlement |
| 5 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) | 5 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) |
| 6 | -from commons.api.sy.feedback_order_settlement_query import feedback_order_settlement_query | 6 | +from commons.api.feedback_order_settlement_query import feedback_order_settlement_query |
| 7 | fosq = feedback_order_settlement_query() | 7 | fosq = feedback_order_settlement_query() |
| 8 | import datetime | 8 | import datetime |
| 9 | fos = feedback_order_settlement() | 9 | fos = feedback_order_settlement() |
testcase/heb/FeedbackOrderController/test_feedback_order_settlement_query.py
| 1 | import unittest | 1 | import unittest |
| 2 | import urllib3 | 2 | import urllib3 |
| 3 | from commons.MySession import heb | 3 | from commons.MySession import heb |
| 4 | -from commons.api.sy.feedback_order_settlement_query import feedback_order_settlement_query | 4 | +from commons.api.feedback_order_settlement_query import feedback_order_settlement_query |
| 5 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) | 5 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) |
| 6 | fosq = feedback_order_settlement_query() | 6 | fosq = feedback_order_settlement_query() |
| 7 | import commons.ConfigDB as db | 7 | import commons.ConfigDB as db |
testcase/heb/entranceFeeBill_detail/test_entranceFeeBill_details.py
| @@ -4,7 +4,7 @@ import unittest | @@ -4,7 +4,7 @@ import unittest | ||
| 4 | import urllib3 | 4 | import urllib3 |
| 5 | from commons import ConfigDB as db | 5 | from commons import ConfigDB as db |
| 6 | from commons.MySession import my,heb | 6 | from commons.MySession import my,heb |
| 7 | -from commons.api.sy.entranceFeeBill_details import entranceFeeBill_details | 7 | +from commons.api.entranceFeeBill_details import entranceFeeBill_details |
| 8 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) | 8 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) |
| 9 | en=entranceFeeBill_details() | 9 | en=entranceFeeBill_details() |
| 10 | 10 |
testcase/heb/entranceFeeBill_proves/test_entranceFeeBill_provesPage.py
| @@ -4,7 +4,7 @@ import unittest | @@ -4,7 +4,7 @@ import unittest | ||
| 4 | import urllib3 | 4 | import urllib3 |
| 5 | from commons import ConfigDB as db | 5 | from commons import ConfigDB as db |
| 6 | from commons.MySession import my,heb | 6 | from commons.MySession import my,heb |
| 7 | -from commons.api.sy.entranceFeeBill_provesPage import entranceFeeBill_provesPage | 7 | +from commons.api.entranceFeeBill_provesPage import entranceFeeBill_provesPage |
| 8 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) | 8 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) |
| 9 | en=entranceFeeBill_provesPage() | 9 | en=entranceFeeBill_provesPage() |
| 10 | 10 |
testcase/heb/feedbackAccounrecordController_list/test_feedbackAccounrecordController_list.py
| 1 | import unittest | 1 | import unittest |
| 2 | import urllib3 | 2 | import urllib3 |
| 3 | from commons.MySession import my,heb | 3 | from commons.MySession import my,heb |
| 4 | -from commons.api.sy.feedbackAccounrecordController_list import feedbackAccounrecordController_list | 4 | +from commons.api.feedbackAccounrecordController_list import feedbackAccounrecordController_list |
| 5 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) | 5 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) |
| 6 | import commons.ConfigDB as db | 6 | import commons.ConfigDB as db |
| 7 | farcl = feedbackAccounrecordController_list() | 7 | farcl = feedbackAccounrecordController_list() |
testcase/heb/feedbackOrderController_settlementlist/feedbackOrderController_querySumAmount.py
| 1 | import unittest | 1 | import unittest |
| 2 | import urllib3 | 2 | import urllib3 |
| 3 | from commons.MySession import heb | 3 | from commons.MySession import heb |
| 4 | -from commons.api.sy.feedbackOrderController_querySumAmount import querySumAmount | 4 | +from commons.api.feedbackOrderController_querySumAmount import querySumAmount |
| 5 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) | 5 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) |
| 6 | import datetime | 6 | import datetime |
| 7 | qsa = querySumAmount() | 7 | qsa = querySumAmount() |
testcase/heb/feedbackOrderController_settlementlist/test_feedbackOrderController_settlementlist.py
| 1 | import unittest | 1 | import unittest |
| 2 | import urllib3 | 2 | import urllib3 |
| 3 | from commons.MySession import heb | 3 | from commons.MySession import heb |
| 4 | -from commons.api.sy.feedbackOrderController_settlementlist import feedbackOrderController_settlementlist | 4 | +from commons.api.feedbackOrderController_settlementlist import feedbackOrderController_settlementlist |
| 5 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) | 5 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) |
| 6 | import commons.ConfigDB as db | 6 | import commons.ConfigDB as db |
| 7 | import datetime | 7 | import datetime |
testcase/heb/test_HP/test_HP.py
| @@ -11,8 +11,8 @@ | @@ -11,8 +11,8 @@ | ||
| 11 | 11 | ||
| 12 | import unittest | 12 | import unittest |
| 13 | from commons.scripts.readConf import rC | 13 | from commons.scripts.readConf import rC |
| 14 | -from commons.api.sy import zcApi as zcA, hpApi | ||
| 15 | -from commons.api.sy.entranceFeeBillList import entranceFeeBillList as eFBL, operationDoFreeze as oDF | 14 | +from commons.api import hpApi, zcApi as zcA |
| 15 | +from commons.api.entranceFeeBillList import operationDoFreeze as oDF, entranceFeeBillList as eFBL | ||
| 16 | import random | 16 | import random |
| 17 | 17 | ||
| 18 | from commons.MySession import sessionHeb | 18 | from commons.MySession import sessionHeb |
testcase/heb/test_SJ/test_SJ.py
| @@ -11,7 +11,7 @@ | @@ -11,7 +11,7 @@ | ||
| 11 | 11 | ||
| 12 | import unittest | 12 | import unittest |
| 13 | from commons.scripts.readConf import rC | 13 | from commons.scripts.readConf import rC |
| 14 | -from commons.api.sy import zcApi as zcA, sjApi | 14 | +from commons.api import sjApi, zcApi as zcA |
| 15 | import random | 15 | import random |
| 16 | from commons.MySession import sessionHeb | 16 | from commons.MySession import sessionHeb |
| 17 | session = sessionHeb | 17 | session = sessionHeb |
testcase/heb/test_ZC/demo_ZC.py
| @@ -11,8 +11,8 @@ | @@ -11,8 +11,8 @@ | ||
| 11 | 11 | ||
| 12 | import unittest | 12 | import unittest |
| 13 | from commons.scripts.readConf import rC | 13 | from commons.scripts.readConf import rC |
| 14 | -from commons.api.sy import zcApi as zcA | ||
| 15 | -from commons.api.sy.entranceFeeBillList import entranceFeeBillList as eFBL | 14 | +from commons.api import zcApi as zcA |
| 15 | +from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL | ||
| 16 | import time,random | 16 | import time,random |
| 17 | 17 | ||
| 18 | class test_demo(unittest.TestCase): | 18 | class test_demo(unittest.TestCase): |
testcase/heb/test_ZC/test_ZCBasic.py
| @@ -11,7 +11,7 @@ | @@ -11,7 +11,7 @@ | ||
| 11 | 11 | ||
| 12 | import unittest | 12 | import unittest |
| 13 | from commons.scripts.readConf import rC | 13 | from commons.scripts.readConf import rC |
| 14 | -from commons.api.sy import zcApi as zcA | 14 | +from commons.api import zcApi as zcA |
| 15 | from commons.basic import getLookupList as gLL | 15 | from commons.basic import getLookupList as gLL |
| 16 | from commons.MySession import sessionHeb | 16 | from commons.MySession import sessionHeb |
| 17 | session = sessionHeb | 17 | session = sessionHeb |
testcase/heb/test_ZC/test_ZCCreate.py
| @@ -11,7 +11,7 @@ | @@ -11,7 +11,7 @@ | ||
| 11 | 11 | ||
| 12 | import unittest | 12 | import unittest |
| 13 | from commons.scripts.readConf import rC | 13 | from commons.scripts.readConf import rC |
| 14 | -from commons.api.sy import zcApi as zcA | 14 | +from commons.api import zcApi as zcA |
| 15 | import time,random | 15 | import time,random |
| 16 | from commons.MySession import sessionHeb | 16 | from commons.MySession import sessionHeb |
| 17 | session = sessionHeb | 17 | session = sessionHeb |
testcase/heb/test_listPage/test_listPageOperation.py
| @@ -11,10 +11,11 @@ | @@ -11,10 +11,11 @@ | ||
| 11 | 11 | ||
| 12 | import unittest | 12 | import unittest |
| 13 | from commons.scripts.readConf import rC | 13 | from commons.scripts.readConf import rC |
| 14 | -from commons.api.sy import zcApi as zcA, hpApi, sjApi | ||
| 15 | -from commons.api.sy.entranceFeeBillList import operationDoUpdate as oDUp, operationDoInvalid as oDI, \ | ||
| 16 | - entranceFeeBillList as eFBL, operationDoAmend as oDA, operationDoCorrect as oDC, operationDoUndo as oDU, \ | ||
| 17 | - operationDoFreeze as oDF, operationUnfreeze as eOp | 14 | +from commons.api import sjApi, hpApi, zcApi as zcA |
| 15 | +from commons.api.entranceFeeBillList import operationDoUndo as oDU | ||
| 16 | +from commons.api.entranceFeeBillList import operationDoFreeze as oDF, operationDoCorrect as oDC, \ | ||
| 17 | + operationDoInvalid as oDI, entranceFeeBillList as eFBL, operationUnfreeze as eOp, operationDoUpdate as oDUp, \ | ||
| 18 | + operationDoAmend as oDA | ||
| 18 | import random | 19 | import random |
| 19 | 20 | ||
| 20 | from commons.MySession import sessionHeb | 21 | from commons.MySession import sessionHeb |
testcase/heb/test_listPage/test_searchByAttrName.py
| @@ -11,10 +11,10 @@ | @@ -11,10 +11,10 @@ | ||
| 11 | 11 | ||
| 12 | import unittest | 12 | import unittest |
| 13 | from commons.scripts.readConf import rC | 13 | from commons.scripts.readConf import rC |
| 14 | -from commons.api.sy import zcApi as zcA | 14 | +from commons.api import zcApi as zcA |
| 15 | from commons import ConfigDB as CoDB | 15 | from commons import ConfigDB as CoDB |
| 16 | from commons.MySession import my | 16 | from commons.MySession import my |
| 17 | -from commons.api.sy.entranceFeeBillList import entranceFeeBillList as eFBL | 17 | +from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL |
| 18 | import random | 18 | import random |
| 19 | from commons.MySession import sessionHeb | 19 | from commons.MySession import sessionHeb |
| 20 | session = sessionHeb | 20 | session = sessionHeb |
testcase/heb/test_listPage/test_searchByOther.py
| @@ -12,11 +12,11 @@ | @@ -12,11 +12,11 @@ | ||
| 12 | import unittest | 12 | import unittest |
| 13 | from bs4 import BeautifulSoup | 13 | from bs4 import BeautifulSoup |
| 14 | from commons.scripts.readConf import rC | 14 | from commons.scripts.readConf import rC |
| 15 | -from commons.api.sy import zcApi as zcA | 15 | +from commons.api import zcApi as zcA |
| 16 | from commons.basic import getLookupList as gLL | 16 | from commons.basic import getLookupList as gLL |
| 17 | from commons.ConfigDB import mysql_selectAll as msa | 17 | from commons.ConfigDB import mysql_selectAll as msa |
| 18 | -from commons.api.sy.entranceFeeBillList import operationDoUpdate as oDUp, entranceFeeBillList as eFBL, \ | ||
| 19 | - operationDoUndo as oDU | 18 | +from commons.api.entranceFeeBillList import operationDoUndo as oDU |
| 19 | +from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL, operationDoUpdate as oDUp | ||
| 20 | import time,random | 20 | import time,random |
| 21 | from commons.MySession import sessionHeb | 21 | from commons.MySession import sessionHeb |
| 22 | session = sessionHeb | 22 | session = sessionHeb |
testcase/heb/weightBizBill/test_weighingServiceSave.py
| @@ -4,7 +4,7 @@ import unittest | @@ -4,7 +4,7 @@ import unittest | ||
| 4 | import urllib3 | 4 | import urllib3 |
| 5 | from commons import common as com | 5 | from commons import common as com |
| 6 | from commons.MySession import my,heb | 6 | from commons.MySession import my,heb |
| 7 | -from commons.api.sy.weighingServiceSave import weighingServiceSave | 7 | +from commons.api.weighingServiceSave import weighingServiceSave |
| 8 | from commons.basic.listCarType import listCarType | 8 | from commons.basic.listCarType import listCarType |
| 9 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) | 9 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) |
| 10 | we=weighingServiceSave(heb) | 10 | we=weighingServiceSave(heb) |
testcase/sy/CZFW/test_weightBizBill_doRefund.py
| @@ -4,8 +4,8 @@ import unittest | @@ -4,8 +4,8 @@ import unittest | ||
| 4 | import urllib3 | 4 | import urllib3 |
| 5 | from commons import ConfigDB as db | 5 | from commons import ConfigDB as db |
| 6 | from commons.MySession import my,sy1 | 6 | from commons.MySession import my,sy1 |
| 7 | -from commons.api.sy.weightBizBill_doRefund import weightBizBill_doRefund | ||
| 8 | -from commons.api.sy.weighingServiceSave import weighingServiceSave | 7 | +from commons.api.weightBizBill_doRefund import weightBizBill_doRefund |
| 8 | +from commons.api.weighingServiceSave import weighingServiceSave | ||
| 9 | from commons.basic.listCarType import listCarType | 9 | from commons.basic.listCarType import listCarType |
| 10 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) | 10 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) |
| 11 | do=weightBizBill_doRefund() | 11 | do=weightBizBill_doRefund() |
testcase/sy/CZFW/test_weightBizBill_listPage.py
| @@ -4,8 +4,8 @@ import unittest | @@ -4,8 +4,8 @@ import unittest | ||
| 4 | import urllib3 | 4 | import urllib3 |
| 5 | import time | 5 | import time |
| 6 | from commons.MySession import my,sy1 | 6 | from commons.MySession import my,sy1 |
| 7 | -from commons.api.sy.weightBizBill_listPage import weightBizBill_listPage | ||
| 8 | -from commons.api.sy.weighingServiceSave import weighingServiceSave | 7 | +from commons.api.weightBizBill_listPage import weightBizBill_listPage |
| 8 | +from commons.api.weighingServiceSave import weighingServiceSave | ||
| 9 | from commons.basic.listCarType import listCarType | 9 | from commons.basic.listCarType import listCarType |
| 10 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) | 10 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) |
| 11 | bi=weightBizBill_listPage() | 11 | bi=weightBizBill_listPage() |
testcase/sy/FeedbackCustomerController/test_fc_add.py
| 1 | import unittest | 1 | import unittest |
| 2 | import urllib3 | 2 | import urllib3 |
| 3 | from commons.MySession import sy1 | 3 | from commons.MySession import sy1 |
| 4 | -from commons.api.sy.fc_add import fc_add | 4 | +from commons.api.fc_add import fc_add |
| 5 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) | 5 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) |
| 6 | from commons.Faker import random_data | 6 | from commons.Faker import random_data |
| 7 | import commons.ConfigDB as db | 7 | import commons.ConfigDB as db |
testcase/sy/FeedbackCustomerController/test_fc_edit.py
| 1 | import unittest | 1 | import unittest |
| 2 | import urllib3 | 2 | import urllib3 |
| 3 | from commons.MySession import sy1 | 3 | from commons.MySession import sy1 |
| 4 | -from commons.api.sy.fc_edit import fc_edit | 4 | +from commons.api.fc_edit import fc_edit |
| 5 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) | 5 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) |
| 6 | from commons.Faker import random_data | 6 | from commons.Faker import random_data |
| 7 | -from commons.api.sy.fc_add import fc_add | 7 | +from commons.api.fc_add import fc_add |
| 8 | ra = random_data() | 8 | ra = random_data() |
| 9 | fca = fc_add() | 9 | fca = fc_add() |
| 10 | import commons.ConfigDB as db | 10 | import commons.ConfigDB as db |
testcase/sy/FeedbackCustomerController/test_fc_view.py
| @@ -2,8 +2,8 @@ import unittest | @@ -2,8 +2,8 @@ import unittest | ||
| 2 | import urllib3 | 2 | import urllib3 |
| 3 | import commons.ConfigDB as db | 3 | import commons.ConfigDB as db |
| 4 | from commons.MySession import sy1 | 4 | from commons.MySession import sy1 |
| 5 | -from commons.api.sy.fc_view import fc_view | ||
| 6 | -from commons.api.sy.fc_add import fc_add | 5 | +from commons.api.fc_view import fc_view |
| 6 | +from commons.api.fc_add import fc_add | ||
| 7 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) | 7 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) |
| 8 | ad = fc_add() | 8 | ad = fc_add() |
| 9 | vi = fc_view() | 9 | vi = fc_view() |
testcase/sy/FeedbackCustomerController/test_feedback_customer_disable.py
| 1 | import unittest | 1 | import unittest |
| 2 | import urllib3 | 2 | import urllib3 |
| 3 | from commons.MySession import sy1 | 3 | from commons.MySession import sy1 |
| 4 | -from commons.api.sy.feedback_customer_disable import feedback_customer_disable | 4 | +from commons.api.feedback_customer_disable import feedback_customer_disable |
| 5 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) | 5 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) |
| 6 | fcd = feedback_customer_disable() | 6 | fcd = feedback_customer_disable() |
| 7 | import commons.ConfigDB as db | 7 | import commons.ConfigDB as db |
testcase/sy/FeedbackCustomerController/test_feedback_customer_enable.py
| 1 | import unittest | 1 | import unittest |
| 2 | import urllib3 | 2 | import urllib3 |
| 3 | from commons.MySession import sy1 | 3 | from commons.MySession import sy1 |
| 4 | -from commons.api.sy.feedback_customer_enable import feedback_customer_enable | ||
| 5 | -from commons.api.sy.feedback_customer_disable import feedback_customer_disable | 4 | +from commons.api.feedback_customer_enable import feedback_customer_enable |
| 5 | +from commons.api.feedback_customer_disable import feedback_customer_disable | ||
| 6 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) | 6 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) |
| 7 | fce = feedback_customer_enable() | 7 | fce = feedback_customer_enable() |
| 8 | fcd = feedback_customer_disable | 8 | fcd = feedback_customer_disable |
testcase/sy/FeedbackCustomerController/test_feedback_customer_query.py
| 1 | import unittest | 1 | import unittest |
| 2 | import urllib3 | 2 | import urllib3 |
| 3 | from commons.MySession import sy1 | 3 | from commons.MySession import sy1 |
| 4 | -from commons.api.sy.feedback_customer_query import feedback_customer_query | 4 | +from commons.api.feedback_customer_query import feedback_customer_query |
| 5 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) | 5 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) |
| 6 | import datetime | 6 | import datetime |
| 7 | import commons.ConfigDB as db | 7 | import commons.ConfigDB as db |
testcase/sy/FeedbackOrderController/test_feedback_order_settlement.py
| 1 | import unittest | 1 | import unittest |
| 2 | import urllib3 | 2 | import urllib3 |
| 3 | from commons.MySession import sy1 | 3 | from commons.MySession import sy1 |
| 4 | -from commons.api.sy.feedback_order_settlement import feedback_order_settlement | 4 | +from commons.api.feedback_order_settlement import feedback_order_settlement |
| 5 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) | 5 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) |
| 6 | -from commons.api.sy.feedback_order_settlement_query import feedback_order_settlement_query | 6 | +from commons.api.feedback_order_settlement_query import feedback_order_settlement_query |
| 7 | fosq = feedback_order_settlement_query() | 7 | fosq = feedback_order_settlement_query() |
| 8 | import datetime | 8 | import datetime |
| 9 | fos = feedback_order_settlement() | 9 | fos = feedback_order_settlement() |
testcase/sy/FeedbackOrderController/test_feedback_order_settlement_query.py
| 1 | import unittest | 1 | import unittest |
| 2 | import urllib3 | 2 | import urllib3 |
| 3 | from commons.MySession import sy1 | 3 | from commons.MySession import sy1 |
| 4 | -from commons.api.sy.feedback_order_settlement_query import feedback_order_settlement_query | 4 | +from commons.api.feedback_order_settlement_query import feedback_order_settlement_query |
| 5 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) | 5 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) |
| 6 | fosq = feedback_order_settlement_query() | 6 | fosq = feedback_order_settlement_query() |
| 7 | import commons.ConfigDB as db | 7 | import commons.ConfigDB as db |
testcase/sy/entranceFeeBill_detail/test_entranceFeeBill_details.py
| @@ -4,7 +4,7 @@ import unittest | @@ -4,7 +4,7 @@ import unittest | ||
| 4 | import urllib3 | 4 | import urllib3 |
| 5 | from commons import ConfigDB as db | 5 | from commons import ConfigDB as db |
| 6 | from commons.MySession import my,sy1 | 6 | from commons.MySession import my,sy1 |
| 7 | -from commons.api.sy.entranceFeeBill_details import entranceFeeBill_details | 7 | +from commons.api.entranceFeeBill_details import entranceFeeBill_details |
| 8 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) | 8 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) |
| 9 | en=entranceFeeBill_details() | 9 | en=entranceFeeBill_details() |
| 10 | 10 |
testcase/sy/entranceFeeBill_proves/test_entranceFeeBill_provesPage.py
| @@ -4,7 +4,7 @@ import unittest | @@ -4,7 +4,7 @@ import unittest | ||
| 4 | import urllib3 | 4 | import urllib3 |
| 5 | from commons import ConfigDB as db | 5 | from commons import ConfigDB as db |
| 6 | from commons.MySession import my,sy1 | 6 | from commons.MySession import my,sy1 |
| 7 | -from commons.api.sy.entranceFeeBill_provesPage import entranceFeeBill_provesPage | 7 | +from commons.api.entranceFeeBill_provesPage import entranceFeeBill_provesPage |
| 8 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) | 8 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) |
| 9 | en=entranceFeeBill_provesPage() | 9 | en=entranceFeeBill_provesPage() |
| 10 | 10 |
testcase/sy/feedbackAccounrecordController_list/test_feedbackAccounrecordController_list.py
| 1 | import unittest | 1 | import unittest |
| 2 | import urllib3 | 2 | import urllib3 |
| 3 | from commons.MySession import sy1 | 3 | from commons.MySession import sy1 |
| 4 | -from commons.api.sy.feedbackAccounrecordController_list import feedbackAccounrecordController_list | 4 | +from commons.api.feedbackAccounrecordController_list import feedbackAccounrecordController_list |
| 5 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) | 5 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) |
| 6 | import commons.ConfigDB as db | 6 | import commons.ConfigDB as db |
| 7 | farcl = feedbackAccounrecordController_list() | 7 | farcl = feedbackAccounrecordController_list() |
testcase/sy/feedbackOrderController_settlementlist/feedbackOrderController_querySumAmount.py
| 1 | import unittest | 1 | import unittest |
| 2 | import urllib3 | 2 | import urllib3 |
| 3 | from commons.MySession import sy1 | 3 | from commons.MySession import sy1 |
| 4 | -from commons.api.sy.feedbackOrderController_querySumAmount import querySumAmount | 4 | +from commons.api.feedbackOrderController_querySumAmount import querySumAmount |
| 5 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) | 5 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) |
| 6 | import datetime | 6 | import datetime |
| 7 | qsa = querySumAmount() | 7 | qsa = querySumAmount() |
testcase/sy/feedbackOrderController_settlementlist/test_feedbackOrderController_settlementlist.py
| 1 | import unittest | 1 | import unittest |
| 2 | import urllib3 | 2 | import urllib3 |
| 3 | from commons.MySession import my,sy1 | 3 | from commons.MySession import my,sy1 |
| 4 | -from commons.api.sy.feedbackOrderController_settlementlist import feedbackOrderController_settlementlist | 4 | +from commons.api.feedbackOrderController_settlementlist import feedbackOrderController_settlementlist |
| 5 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) | 5 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) |
| 6 | import commons.ConfigDB as db | 6 | import commons.ConfigDB as db |
| 7 | import datetime | 7 | import datetime |
testcase/sy/test_HP/test_HP.py
| @@ -11,8 +11,8 @@ | @@ -11,8 +11,8 @@ | ||
| 11 | 11 | ||
| 12 | import unittest | 12 | import unittest |
| 13 | from commons.scripts.readConf import rC | 13 | from commons.scripts.readConf import rC |
| 14 | -from commons.api.sy import zcApi as zcA, hpApi | ||
| 15 | -from commons.api.sy.entranceFeeBillList import entranceFeeBillList as eFBL, operationDoFreeze as oDF | 14 | +from commons.api import hpApi, zcApi as zcA |
| 15 | +from commons.api.entranceFeeBillList import operationDoFreeze as oDF, entranceFeeBillList as eFBL | ||
| 16 | import random | 16 | import random |
| 17 | 17 | ||
| 18 | from commons.MySession import sessionSy | 18 | from commons.MySession import sessionSy |
testcase/sy/test_SJ/test_SJ.py
| @@ -11,7 +11,7 @@ | @@ -11,7 +11,7 @@ | ||
| 11 | 11 | ||
| 12 | import unittest | 12 | import unittest |
| 13 | from commons.scripts.readConf import rC | 13 | from commons.scripts.readConf import rC |
| 14 | -from commons.api.sy import zcApi as zcA, sjApi | 14 | +from commons.api import sjApi, zcApi as zcA |
| 15 | import random | 15 | import random |
| 16 | 16 | ||
| 17 | from commons.MySession import sessionSy | 17 | from commons.MySession import sessionSy |
testcase/sy/test_ZC/demo_ZC.py
| @@ -11,8 +11,8 @@ | @@ -11,8 +11,8 @@ | ||
| 11 | 11 | ||
| 12 | import unittest | 12 | import unittest |
| 13 | from commons.scripts.readConf import rC | 13 | from commons.scripts.readConf import rC |
| 14 | -from commons.api.sy import zcApi as zcA | ||
| 15 | -from commons.api.sy.entranceFeeBillList import entranceFeeBillList as eFBL | 14 | +from commons.api import zcApi as zcA |
| 15 | +from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL | ||
| 16 | import time,random | 16 | import time,random |
| 17 | 17 | ||
| 18 | class test_demo(unittest.TestCase): | 18 | class test_demo(unittest.TestCase): |
testcase/sy/test_ZC/demo_b.py
| @@ -11,7 +11,7 @@ | @@ -11,7 +11,7 @@ | ||
| 11 | 11 | ||
| 12 | import unittest | 12 | import unittest |
| 13 | from commons.scripts.readConf import rC | 13 | from commons.scripts.readConf import rC |
| 14 | -from commons.api.sy.entranceFeeBillList import apiDemo | 14 | +from commons.api.entranceFeeBillList import apiDemo |
| 15 | 15 | ||
| 16 | from commons.MySession import mysession | 16 | from commons.MySession import mysession |
| 17 | session = mysession().cliLogin() | 17 | session = mysession().cliLogin() |
testcase/sy/test_ZC/test_ZCBasic.py
| @@ -11,7 +11,7 @@ | @@ -11,7 +11,7 @@ | ||
| 11 | 11 | ||
| 12 | import unittest | 12 | import unittest |
| 13 | from commons.scripts.readConf import rC | 13 | from commons.scripts.readConf import rC |
| 14 | -from commons.api.sy import zcApi as zcA | 14 | +from commons.api import zcApi as zcA |
| 15 | from commons.basic import getLookupList as gLL | 15 | from commons.basic import getLookupList as gLL |
| 16 | from commons.MySession import sessionSy | 16 | from commons.MySession import sessionSy |
| 17 | session = sessionSy | 17 | session = sessionSy |
testcase/sy/test_ZC/test_ZCCreate.py
| @@ -11,7 +11,7 @@ | @@ -11,7 +11,7 @@ | ||
| 11 | 11 | ||
| 12 | import unittest | 12 | import unittest |
| 13 | from commons.scripts.readConf import rC | 13 | from commons.scripts.readConf import rC |
| 14 | -from commons.api.sy import zcApi as zcA | 14 | +from commons.api import zcApi as zcA |
| 15 | import time,random | 15 | import time,random |
| 16 | from commons.MySession import sessionSy | 16 | from commons.MySession import sessionSy |
| 17 | session = sessionSy | 17 | session = sessionSy |
testcase/sy/test_listPage/test_listPageOperation.py
| @@ -11,10 +11,11 @@ | @@ -11,10 +11,11 @@ | ||
| 11 | 11 | ||
| 12 | import unittest | 12 | import unittest |
| 13 | from commons.scripts.readConf import rC | 13 | from commons.scripts.readConf import rC |
| 14 | -from commons.api.sy import zcApi as zcA, hpApi, sjApi | ||
| 15 | -from commons.api.sy.entranceFeeBillList import operationDoUpdate as oDUp, operationDoInvalid as oDI, \ | ||
| 16 | - entranceFeeBillList as eFBL, operationDoAmend as oDA, operationDoCorrect as oDC, operationDoUndo as oDU, \ | ||
| 17 | - operationDoFreeze as oDF, operationUnfreeze as eOp | 14 | +from commons.api import sjApi, hpApi, zcApi as zcA |
| 15 | +from commons.api.entranceFeeBillList import operationDoUndo as oDU | ||
| 16 | +from commons.api.entranceFeeBillList import operationDoFreeze as oDF, operationDoCorrect as oDC, \ | ||
| 17 | + operationDoInvalid as oDI, entranceFeeBillList as eFBL, operationUnfreeze as eOp, operationDoUpdate as oDUp, \ | ||
| 18 | + operationDoAmend as oDA | ||
| 18 | import random | 19 | import random |
| 19 | 20 | ||
| 20 | from commons.MySession import sessionSy | 21 | from commons.MySession import sessionSy |
testcase/sy/test_listPage/test_searchByAttrName.py
| @@ -11,9 +11,9 @@ | @@ -11,9 +11,9 @@ | ||
| 11 | 11 | ||
| 12 | import unittest | 12 | import unittest |
| 13 | from commons.scripts.readConf import rC | 13 | from commons.scripts.readConf import rC |
| 14 | -from commons.api.sy import zcApi as zcA | 14 | +from commons.api import zcApi as zcA |
| 15 | from commons import ConfigDB as CoDB | 15 | from commons import ConfigDB as CoDB |
| 16 | -from commons.api.sy.entranceFeeBillList import entranceFeeBillList as eFBL | 16 | +from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL |
| 17 | import random | 17 | import random |
| 18 | from commons.MySession import sessionSy | 18 | from commons.MySession import sessionSy |
| 19 | session = sessionSy | 19 | session = sessionSy |
testcase/sy/test_listPage/test_searchByOther.py
| @@ -12,11 +12,11 @@ | @@ -12,11 +12,11 @@ | ||
| 12 | import unittest | 12 | import unittest |
| 13 | from bs4 import BeautifulSoup | 13 | from bs4 import BeautifulSoup |
| 14 | from commons.scripts.readConf import rC | 14 | from commons.scripts.readConf import rC |
| 15 | -from commons.api.sy import zcApi as zcA | 15 | +from commons.api import zcApi as zcA |
| 16 | from commons.basic import getLookupList as gLL | 16 | from commons.basic import getLookupList as gLL |
| 17 | from commons.ConfigDB import mysql_selectAll as msa | 17 | from commons.ConfigDB import mysql_selectAll as msa |
| 18 | -from commons.api.sy.entranceFeeBillList import operationDoUpdate as oDUp, entranceFeeBillList as eFBL, \ | ||
| 19 | - operationDoUndo as oDU | 18 | +from commons.api.entranceFeeBillList import operationDoUndo as oDU |
| 19 | +from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL, operationDoUpdate as oDUp | ||
| 20 | import time,random | 20 | import time,random |
| 21 | from commons.MySession import sessionSy | 21 | from commons.MySession import sessionSy |
| 22 | session = sessionSy | 22 | session = sessionSy |
testcase/sy/weightBizBill/test_weighingServiceSave.py
| @@ -4,7 +4,7 @@ import unittest | @@ -4,7 +4,7 @@ import unittest | ||
| 4 | import urllib3 | 4 | import urllib3 |
| 5 | from commons import common as com | 5 | from commons import common as com |
| 6 | from commons.MySession import my,sy1 | 6 | from commons.MySession import my,sy1 |
| 7 | -from commons.api.sy.weighingServiceSave import weighingServiceSave | 7 | +from commons.api.weighingServiceSave import weighingServiceSave |
| 8 | from commons.basic.listCarType import listCarType | 8 | from commons.basic.listCarType import listCarType |
| 9 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) | 9 | urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) |
| 10 | we=weighingServiceSave(sy1) | 10 | we=weighingServiceSave(sy1) |