From 88feaec9aeb8fd47ff5e9e486ed5e3d66a033087 Mon Sep 17 00:00:00 2001 From: floraachy Date: Thu, 12 Mar 2020 17:30:22 +0800 Subject: [PATCH] change some files --- .../{Python => }/flora_0204_homework.txt | 0 .../{Python => }/flora_0206_notes.txt | 0 .../{Python => }/flora_0208_notes.txt | 0 .../{Python => }/flora_0211_notes.txt | 0 .../{Python => }/flora_0213_notes.txt | 0 .../{Python => }/flora_0215_notes.txt | 0 .../{Python => }/flora_0218_notes.txt | 0 .../{Python => }/flora_0220_notes.txt | 0 .../{Python => }/flora_0222_notes.txt | 0 .../{Python => }/flora_0225_notes.txt | 0 .../{Python => }/flora_0227_notes.txt | 0 .../{Python => }/flora_0229_notes.txt | 0 .../{Python => }/flora_0303_notes.txt | 0 .../python/FloraHomeWork_0206.py | 0 .../python/FloraHomeWork_0208.py | 0 .../python/FloraHomeWork_0211.py | 0 .../python/FloraHomeWork_0213.py | 0 .../python/FloraHomeWork_0215.py | 0 .../python/FloraHomeWork_0218.py | 0 .../python/FloraHomeWork_0220.py | 0 .../python/FloraHomeWork_0222.py | 0 .../python/FloraHomeWork_0225.py | 0 .../python/FloraHomeWork_0227.py | 0 .../python/FloraHomeWork_0229.py | 0 .../python/FloraHomeWork_0303.py | 0 .../unitTest/homeWork03052020/registerPage.py | 0 .../unitTest/homeWork03052020/runTest.py | 0 .../unitTest/homeWork03052020/testCase.py | 2 +- .../testReport/register_beautiful_report.html | 0 .../unitTest/homeWork03072020/demo1/casesData.xlsx | Bin .../unitTest/homeWork03072020/demo1/ddtNew.py | 0 .../unitTest/homeWork03072020/demo1/login.py | 0 .../unitTest/homeWork03072020/demo1/readExcel.py | 0 .../unitTest/homeWork03072020/demo1/runTest.py | 6 +++--- .../unitTest/homeWork03072020/demo1/testLogin.py | 4 ++-- .../unitTest/homeWork03072020/demo2/casesData2.xlsx | Bin .../unitTest/homeWork03072020/demo2/ddtNew.py | 0 .../unitTest/homeWork03072020/demo2/login.py | 0 .../unitTest/homeWork03072020/demo2/readExcel2.py | 0 .../unitTest/homeWork03072020/demo2/runTest.py | 6 +++--- .../unitTest/homeWork03072020/demo2/testLogin2.py | 4 +++- .../testReport/login_test_report_Beauty.html | 0 .../testReport/login_test_report_HTML.html | 0 .../unitTest/homeWork03102020/ddtNew.py | 0 .../unitTest/homeWork03102020/login.py | 0 .../unitTest/homeWork03102020/loginCaseData.xlsx | Bin .../unitTest/homeWork03102020/readExcel.py | 0 .../unitTest/homeWork03102020/runTest.py | 0 .../unitTest/homeWork03102020/testLogin.py | 4 +++- .../testReport/loginFunctionTestReport_01.html | 0 .../testReport/login_2020-03-11 14_06_06.html | 0 .../testReport/login_2020-03-11 14_06_52.html | 0 .../testReport/login_2020-03-11 14_20_21.html | 0 .../testReport/login_2020-03-11 14_20_43.html | 0 .../testReport/login_2020-03-12 12_12_28.html | 0 .../testReport/login_2020-03-12 12_12_54.html | 0 .../testReport/login_2020-03-12 12_15_20.html | 0 .../testReport/login_2020-03-12 12_15_30.html | 0 58 files changed, 15 insertions(+), 11 deletions(-) rename python27Class/pythonLearningNotes/{Python => }/flora_0204_homework.txt (100%) rename python27Class/pythonLearningNotes/{Python => }/flora_0206_notes.txt (100%) rename python27Class/pythonLearningNotes/{Python => }/flora_0208_notes.txt (100%) rename python27Class/pythonLearningNotes/{Python => }/flora_0211_notes.txt (100%) rename python27Class/pythonLearningNotes/{Python => }/flora_0213_notes.txt (100%) rename python27Class/pythonLearningNotes/{Python => }/flora_0215_notes.txt (100%) rename python27Class/pythonLearningNotes/{Python => }/flora_0218_notes.txt (100%) rename python27Class/pythonLearningNotes/{Python => }/flora_0220_notes.txt (100%) rename python27Class/pythonLearningNotes/{Python => }/flora_0222_notes.txt (100%) rename python27Class/pythonLearningNotes/{Python => }/flora_0225_notes.txt (100%) rename python27Class/pythonLearningNotes/{Python => }/flora_0227_notes.txt (100%) rename python27Class/pythonLearningNotes/{Python => }/flora_0229_notes.txt (100%) rename python27Class/pythonLearningNotes/{Python => }/flora_0303_notes.txt (100%) rename {python27Class/homeWork => python27HomeWork}/python/FloraHomeWork_0206.py (100%) rename {python27Class/homeWork => python27HomeWork}/python/FloraHomeWork_0208.py (100%) rename {python27Class/homeWork => python27HomeWork}/python/FloraHomeWork_0211.py (100%) rename {python27Class/homeWork => python27HomeWork}/python/FloraHomeWork_0213.py (100%) rename {python27Class/homeWork => python27HomeWork}/python/FloraHomeWork_0215.py (100%) rename {python27Class/homeWork => python27HomeWork}/python/FloraHomeWork_0218.py (100%) rename {python27Class/homeWork => python27HomeWork}/python/FloraHomeWork_0220.py (100%) rename {python27Class/homeWork => python27HomeWork}/python/FloraHomeWork_0222.py (100%) rename {python27Class/homeWork => python27HomeWork}/python/FloraHomeWork_0225.py (100%) rename {python27Class/homeWork => python27HomeWork}/python/FloraHomeWork_0227.py (100%) rename {python27Class/homeWork => python27HomeWork}/python/FloraHomeWork_0229.py (100%) rename {python27Class/homeWork => python27HomeWork}/python/FloraHomeWork_0303.py (100%) rename {python27Class/homeWork => python27HomeWork}/unitTest/homeWork03052020/registerPage.py (100%) rename {python27Class/homeWork => python27HomeWork}/unitTest/homeWork03052020/runTest.py (100%) rename {python27Class/homeWork => python27HomeWork}/unitTest/homeWork03052020/testCase.py (98%) rename {python27Class/homeWork => python27HomeWork}/unitTest/homeWork03052020/testReport/register_beautiful_report.html (100%) rename {python27Class/homeWork => python27HomeWork}/unitTest/homeWork03072020/demo1/casesData.xlsx (100%) rename {python27Class/homeWork => python27HomeWork}/unitTest/homeWork03072020/demo1/ddtNew.py (100%) rename {python27Class/homeWork => python27HomeWork}/unitTest/homeWork03072020/demo1/login.py (100%) rename {python27Class/homeWork => python27HomeWork}/unitTest/homeWork03072020/demo1/readExcel.py (100%) rename {python27Class/homeWork => python27HomeWork}/unitTest/homeWork03072020/demo1/runTest.py (90%) rename {python27Class/homeWork => python27HomeWork}/unitTest/homeWork03072020/demo1/testLogin.py (96%) rename {python27Class/homeWork => python27HomeWork}/unitTest/homeWork03072020/demo2/casesData2.xlsx (100%) rename {python27Class/homeWork => python27HomeWork}/unitTest/homeWork03072020/demo2/ddtNew.py (100%) rename {python27Class/homeWork => python27HomeWork}/unitTest/homeWork03072020/demo2/login.py (100%) rename {python27Class/homeWork => python27HomeWork}/unitTest/homeWork03072020/demo2/readExcel2.py (100%) rename {python27Class/homeWork => python27HomeWork}/unitTest/homeWork03072020/demo2/runTest.py (90%) rename {python27Class/homeWork => python27HomeWork}/unitTest/homeWork03072020/demo2/testLogin2.py (96%) rename {python27Class/homeWork => python27HomeWork}/unitTest/homeWork03072020/testReport/login_test_report_Beauty.html (100%) rename {python27Class/homeWork => python27HomeWork}/unitTest/homeWork03072020/testReport/login_test_report_HTML.html (100%) rename {python27Class/homeWork => python27HomeWork}/unitTest/homeWork03102020/ddtNew.py (100%) rename {python27Class/homeWork => python27HomeWork}/unitTest/homeWork03102020/login.py (100%) rename {python27Class/homeWork => python27HomeWork}/unitTest/homeWork03102020/loginCaseData.xlsx (100%) rename {python27Class/homeWork => python27HomeWork}/unitTest/homeWork03102020/readExcel.py (100%) rename {python27Class/homeWork => python27HomeWork}/unitTest/homeWork03102020/runTest.py (100%) rename {python27Class/homeWork => python27HomeWork}/unitTest/homeWork03102020/testLogin.py (96%) rename {python27Class/homeWork => python27HomeWork}/unitTest/homeWork03102020/testReport/loginFunctionTestReport_01.html (100%) rename {python27Class/homeWork => python27HomeWork}/unitTest/homeWork03102020/testReport/login_2020-03-11 14_06_06.html (100%) rename {python27Class/homeWork => python27HomeWork}/unitTest/homeWork03102020/testReport/login_2020-03-11 14_06_52.html (100%) rename {python27Class/homeWork => python27HomeWork}/unitTest/homeWork03102020/testReport/login_2020-03-11 14_20_21.html (100%) rename {python27Class/homeWork => python27HomeWork}/unitTest/homeWork03102020/testReport/login_2020-03-11 14_20_43.html (100%) rename {python27Class/homeWork => python27HomeWork}/unitTest/homeWork03102020/testReport/login_2020-03-12 12_12_28.html (100%) rename {python27Class/homeWork => python27HomeWork}/unitTest/homeWork03102020/testReport/login_2020-03-12 12_12_54.html (100%) rename {python27Class/homeWork => python27HomeWork}/unitTest/homeWork03102020/testReport/login_2020-03-12 12_15_20.html (100%) rename {python27Class/homeWork => python27HomeWork}/unitTest/homeWork03102020/testReport/login_2020-03-12 12_15_30.html (100%) diff --git a/python27Class/pythonLearningNotes/Python/flora_0204_homework.txt b/python27Class/pythonLearningNotes/flora_0204_homework.txt similarity index 100% rename from python27Class/pythonLearningNotes/Python/flora_0204_homework.txt rename to python27Class/pythonLearningNotes/flora_0204_homework.txt diff --git a/python27Class/pythonLearningNotes/Python/flora_0206_notes.txt b/python27Class/pythonLearningNotes/flora_0206_notes.txt similarity index 100% rename from python27Class/pythonLearningNotes/Python/flora_0206_notes.txt rename to python27Class/pythonLearningNotes/flora_0206_notes.txt diff --git a/python27Class/pythonLearningNotes/Python/flora_0208_notes.txt b/python27Class/pythonLearningNotes/flora_0208_notes.txt similarity index 100% rename from python27Class/pythonLearningNotes/Python/flora_0208_notes.txt rename to python27Class/pythonLearningNotes/flora_0208_notes.txt diff --git a/python27Class/pythonLearningNotes/Python/flora_0211_notes.txt b/python27Class/pythonLearningNotes/flora_0211_notes.txt similarity index 100% rename from python27Class/pythonLearningNotes/Python/flora_0211_notes.txt rename to python27Class/pythonLearningNotes/flora_0211_notes.txt diff --git a/python27Class/pythonLearningNotes/Python/flora_0213_notes.txt b/python27Class/pythonLearningNotes/flora_0213_notes.txt similarity index 100% rename from python27Class/pythonLearningNotes/Python/flora_0213_notes.txt rename to python27Class/pythonLearningNotes/flora_0213_notes.txt diff --git a/python27Class/pythonLearningNotes/Python/flora_0215_notes.txt b/python27Class/pythonLearningNotes/flora_0215_notes.txt similarity index 100% rename from python27Class/pythonLearningNotes/Python/flora_0215_notes.txt rename to python27Class/pythonLearningNotes/flora_0215_notes.txt diff --git a/python27Class/pythonLearningNotes/Python/flora_0218_notes.txt b/python27Class/pythonLearningNotes/flora_0218_notes.txt similarity index 100% rename from python27Class/pythonLearningNotes/Python/flora_0218_notes.txt rename to python27Class/pythonLearningNotes/flora_0218_notes.txt diff --git a/python27Class/pythonLearningNotes/Python/flora_0220_notes.txt b/python27Class/pythonLearningNotes/flora_0220_notes.txt similarity index 100% rename from python27Class/pythonLearningNotes/Python/flora_0220_notes.txt rename to python27Class/pythonLearningNotes/flora_0220_notes.txt diff --git a/python27Class/pythonLearningNotes/Python/flora_0222_notes.txt b/python27Class/pythonLearningNotes/flora_0222_notes.txt similarity index 100% rename from python27Class/pythonLearningNotes/Python/flora_0222_notes.txt rename to python27Class/pythonLearningNotes/flora_0222_notes.txt diff --git a/python27Class/pythonLearningNotes/Python/flora_0225_notes.txt b/python27Class/pythonLearningNotes/flora_0225_notes.txt similarity index 100% rename from python27Class/pythonLearningNotes/Python/flora_0225_notes.txt rename to python27Class/pythonLearningNotes/flora_0225_notes.txt diff --git a/python27Class/pythonLearningNotes/Python/flora_0227_notes.txt b/python27Class/pythonLearningNotes/flora_0227_notes.txt similarity index 100% rename from python27Class/pythonLearningNotes/Python/flora_0227_notes.txt rename to python27Class/pythonLearningNotes/flora_0227_notes.txt diff --git a/python27Class/pythonLearningNotes/Python/flora_0229_notes.txt b/python27Class/pythonLearningNotes/flora_0229_notes.txt similarity index 100% rename from python27Class/pythonLearningNotes/Python/flora_0229_notes.txt rename to python27Class/pythonLearningNotes/flora_0229_notes.txt diff --git a/python27Class/pythonLearningNotes/Python/flora_0303_notes.txt b/python27Class/pythonLearningNotes/flora_0303_notes.txt similarity index 100% rename from python27Class/pythonLearningNotes/Python/flora_0303_notes.txt rename to python27Class/pythonLearningNotes/flora_0303_notes.txt diff --git a/python27Class/homeWork/python/FloraHomeWork_0206.py b/python27HomeWork/python/FloraHomeWork_0206.py similarity index 100% rename from python27Class/homeWork/python/FloraHomeWork_0206.py rename to python27HomeWork/python/FloraHomeWork_0206.py diff --git a/python27Class/homeWork/python/FloraHomeWork_0208.py b/python27HomeWork/python/FloraHomeWork_0208.py similarity index 100% rename from python27Class/homeWork/python/FloraHomeWork_0208.py rename to python27HomeWork/python/FloraHomeWork_0208.py diff --git a/python27Class/homeWork/python/FloraHomeWork_0211.py b/python27HomeWork/python/FloraHomeWork_0211.py similarity index 100% rename from python27Class/homeWork/python/FloraHomeWork_0211.py rename to python27HomeWork/python/FloraHomeWork_0211.py diff --git a/python27Class/homeWork/python/FloraHomeWork_0213.py b/python27HomeWork/python/FloraHomeWork_0213.py similarity index 100% rename from python27Class/homeWork/python/FloraHomeWork_0213.py rename to python27HomeWork/python/FloraHomeWork_0213.py diff --git a/python27Class/homeWork/python/FloraHomeWork_0215.py b/python27HomeWork/python/FloraHomeWork_0215.py similarity index 100% rename from python27Class/homeWork/python/FloraHomeWork_0215.py rename to python27HomeWork/python/FloraHomeWork_0215.py diff --git a/python27Class/homeWork/python/FloraHomeWork_0218.py b/python27HomeWork/python/FloraHomeWork_0218.py similarity index 100% rename from python27Class/homeWork/python/FloraHomeWork_0218.py rename to python27HomeWork/python/FloraHomeWork_0218.py diff --git a/python27Class/homeWork/python/FloraHomeWork_0220.py b/python27HomeWork/python/FloraHomeWork_0220.py similarity index 100% rename from python27Class/homeWork/python/FloraHomeWork_0220.py rename to python27HomeWork/python/FloraHomeWork_0220.py diff --git a/python27Class/homeWork/python/FloraHomeWork_0222.py b/python27HomeWork/python/FloraHomeWork_0222.py similarity index 100% rename from python27Class/homeWork/python/FloraHomeWork_0222.py rename to python27HomeWork/python/FloraHomeWork_0222.py diff --git a/python27Class/homeWork/python/FloraHomeWork_0225.py b/python27HomeWork/python/FloraHomeWork_0225.py similarity index 100% rename from python27Class/homeWork/python/FloraHomeWork_0225.py rename to python27HomeWork/python/FloraHomeWork_0225.py diff --git a/python27Class/homeWork/python/FloraHomeWork_0227.py b/python27HomeWork/python/FloraHomeWork_0227.py similarity index 100% rename from python27Class/homeWork/python/FloraHomeWork_0227.py rename to python27HomeWork/python/FloraHomeWork_0227.py diff --git a/python27Class/homeWork/python/FloraHomeWork_0229.py b/python27HomeWork/python/FloraHomeWork_0229.py similarity index 100% rename from python27Class/homeWork/python/FloraHomeWork_0229.py rename to python27HomeWork/python/FloraHomeWork_0229.py diff --git a/python27Class/homeWork/python/FloraHomeWork_0303.py b/python27HomeWork/python/FloraHomeWork_0303.py similarity index 100% rename from python27Class/homeWork/python/FloraHomeWork_0303.py rename to python27HomeWork/python/FloraHomeWork_0303.py diff --git a/python27Class/homeWork/unitTest/homeWork03052020/registerPage.py b/python27HomeWork/unitTest/homeWork03052020/registerPage.py similarity index 100% rename from python27Class/homeWork/unitTest/homeWork03052020/registerPage.py rename to python27HomeWork/unitTest/homeWork03052020/registerPage.py diff --git a/python27Class/homeWork/unitTest/homeWork03052020/runTest.py b/python27HomeWork/unitTest/homeWork03052020/runTest.py similarity index 100% rename from python27Class/homeWork/unitTest/homeWork03052020/runTest.py rename to python27HomeWork/unitTest/homeWork03052020/runTest.py diff --git a/python27Class/homeWork/unitTest/homeWork03052020/testCase.py b/python27HomeWork/unitTest/homeWork03052020/testCase.py similarity index 98% rename from python27Class/homeWork/unitTest/homeWork03052020/testCase.py rename to python27HomeWork/unitTest/homeWork03052020/testCase.py index ff6d5a3..402b25d 100644 --- a/python27Class/homeWork/unitTest/homeWork03052020/testCase.py +++ b/python27HomeWork/unitTest/homeWork03052020/testCase.py @@ -7,7 +7,7 @@ Time: 2020/3/6 9:01 """ import unittest -from python27Class.homeWork.unitTest.homeWork03052020.registerPage import register +from python27HomeWork.unitTest.homeWork03052020.registerPage import register class RegisterTestCase(unittest.TestCase): diff --git a/python27Class/homeWork/unitTest/homeWork03052020/testReport/register_beautiful_report.html b/python27HomeWork/unitTest/homeWork03052020/testReport/register_beautiful_report.html similarity index 100% rename from python27Class/homeWork/unitTest/homeWork03052020/testReport/register_beautiful_report.html rename to python27HomeWork/unitTest/homeWork03052020/testReport/register_beautiful_report.html diff --git a/python27Class/homeWork/unitTest/homeWork03072020/demo1/casesData.xlsx b/python27HomeWork/unitTest/homeWork03072020/demo1/casesData.xlsx similarity index 100% rename from python27Class/homeWork/unitTest/homeWork03072020/demo1/casesData.xlsx rename to python27HomeWork/unitTest/homeWork03072020/demo1/casesData.xlsx diff --git a/python27Class/homeWork/unitTest/homeWork03072020/demo1/ddtNew.py b/python27HomeWork/unitTest/homeWork03072020/demo1/ddtNew.py similarity index 100% rename from python27Class/homeWork/unitTest/homeWork03072020/demo1/ddtNew.py rename to python27HomeWork/unitTest/homeWork03072020/demo1/ddtNew.py diff --git a/python27Class/homeWork/unitTest/homeWork03072020/demo1/login.py b/python27HomeWork/unitTest/homeWork03072020/demo1/login.py similarity index 100% rename from python27Class/homeWork/unitTest/homeWork03072020/demo1/login.py rename to python27HomeWork/unitTest/homeWork03072020/demo1/login.py diff --git a/python27Class/homeWork/unitTest/homeWork03072020/demo1/readExcel.py b/python27HomeWork/unitTest/homeWork03072020/demo1/readExcel.py similarity index 100% rename from python27Class/homeWork/unitTest/homeWork03072020/demo1/readExcel.py rename to python27HomeWork/unitTest/homeWork03072020/demo1/readExcel.py diff --git a/python27Class/homeWork/unitTest/homeWork03072020/demo1/runTest.py b/python27HomeWork/unitTest/homeWork03072020/demo1/runTest.py similarity index 90% rename from python27Class/homeWork/unitTest/homeWork03072020/demo1/runTest.py rename to python27HomeWork/unitTest/homeWork03072020/demo1/runTest.py index af2d73d..250893c 100644 --- a/python27Class/homeWork/unitTest/homeWork03072020/demo1/runTest.py +++ b/python27HomeWork/unitTest/homeWork03072020/demo1/runTest.py @@ -18,14 +18,14 @@ import os 第二步：加载测试用例到测试套件 """ # 第一种：通过测试用例类去加载 -# from python27Class.homeWork.unitTest.homeWork03072020.testLogin import LoginTestCase +# from python27Class.python27HomeWork.unitTest.homeWork03072020.testLogin import LoginTestCase # loader = unittest.TestLoader() # suite.addTest(loader.loadTestsFromTestCase(LoginTestCase)) # 第二种：通过测试用例模块去加载 # 用例加载器对象 -# from python27Class.homeWork.unitTest.homeWork03072020 import testLogin +# from python27Class.python27HomeWork.unitTest.homeWork03072020 import testLogin # loader=unittest.TestLoader() # suite.addTest(loader.loadTestsFromModule(testLogin)) @@ -36,7 +36,7 @@ import os # suite.addTest(loader.discover(path)) # 第四种：一条条去加载 -# from python27Class.homeWork.unitTest.homeWork03072020.testLogin import LoginTestCase +# from python27Class.python27HomeWork.unitTest.homeWork03072020.testLogin import LoginTestCase # case1 = LoginTestCase('test_login') # suite.addTest(case1) # # 报错： AttributeError: 'LoginTestCase' object has no attribute 'test_login' diff --git a/python27Class/homeWork/unitTest/homeWork03072020/demo1/testLogin.py b/python27HomeWork/unitTest/homeWork03072020/demo1/testLogin.py similarity index 96% rename from python27Class/homeWork/unitTest/homeWork03072020/demo1/testLogin.py rename to python27HomeWork/unitTest/homeWork03072020/demo1/testLogin.py index fe96cd7..b21d694 100644 --- a/python27Class/homeWork/unitTest/homeWork03072020/demo1/testLogin.py +++ b/python27HomeWork/unitTest/homeWork03072020/demo1/testLogin.py @@ -7,10 +7,10 @@ Time: 2020/3/5 20:23 """ import unittest +from python27Class.homeWork.unitTest.homeWork03072020.demo1.ddtNew import ddt, data from python27Class.homeWork.unitTest.homeWork03072020.demo1.login import login_check -from python27Class.homeWork.unitTest.homeWork03072020.demo1.readExcel import login_data -from python27Class.homeWork.unitTest.homeWork03072020.demo1.ddtNew import ddt, data +from python27HomeWork.unitTest.homeWork03072020.demo1.readExcel import login_data """ # 定义测试用例类：必须继承unittest.TestCase diff --git a/python27Class/homeWork/unitTest/homeWork03072020/demo2/casesData2.xlsx b/python27HomeWork/unitTest/homeWork03072020/demo2/casesData2.xlsx similarity index 100% rename from python27Class/homeWork/unitTest/homeWork03072020/demo2/casesData2.xlsx rename to python27HomeWork/unitTest/homeWork03072020/demo2/casesData2.xlsx diff --git a/python27Class/homeWork/unitTest/homeWork03072020/demo2/ddtNew.py b/python27HomeWork/unitTest/homeWork03072020/demo2/ddtNew.py similarity index 100% rename from python27Class/homeWork/unitTest/homeWork03072020/demo2/ddtNew.py rename to python27HomeWork/unitTest/homeWork03072020/demo2/ddtNew.py diff --git a/python27Class/homeWork/unitTest/homeWork03072020/demo2/login.py b/python27HomeWork/unitTest/homeWork03072020/demo2/login.py similarity index 100% rename from python27Class/homeWork/unitTest/homeWork03072020/demo2/login.py rename to python27HomeWork/unitTest/homeWork03072020/demo2/login.py diff --git a/python27Class/homeWork/unitTest/homeWork03072020/demo2/readExcel2.py b/python27HomeWork/unitTest/homeWork03072020/demo2/readExcel2.py similarity index 100% rename from python27Class/homeWork/unitTest/homeWork03072020/demo2/readExcel2.py rename to python27HomeWork/unitTest/homeWork03072020/demo2/readExcel2.py diff --git a/python27Class/homeWork/unitTest/homeWork03072020/demo2/runTest.py b/python27HomeWork/unitTest/homeWork03072020/demo2/runTest.py similarity index 90% rename from python27Class/homeWork/unitTest/homeWork03072020/demo2/runTest.py rename to python27HomeWork/unitTest/homeWork03072020/demo2/runTest.py index af2d73d..250893c 100644 --- a/python27Class/homeWork/unitTest/homeWork03072020/demo2/runTest.py +++ b/python27HomeWork/unitTest/homeWork03072020/demo2/runTest.py @@ -18,14 +18,14 @@ import os 第二步：加载测试用例到测试套件 """ # 第一种：通过测试用例类去加载 -# from python27Class.homeWork.unitTest.homeWork03072020.testLogin import LoginTestCase +# from python27Class.python27HomeWork.unitTest.homeWork03072020.testLogin import LoginTestCase # loader = unittest.TestLoader() # suite.addTest(loader.loadTestsFromTestCase(LoginTestCase)) # 第二种：通过测试用例模块去加载 # 用例加载器对象 -# from python27Class.homeWork.unitTest.homeWork03072020 import testLogin +# from python27Class.python27HomeWork.unitTest.homeWork03072020 import testLogin # loader=unittest.TestLoader() # suite.addTest(loader.loadTestsFromModule(testLogin)) @@ -36,7 +36,7 @@ import os # suite.addTest(loader.discover(path)) # 第四种：一条条去加载 -# from python27Class.homeWork.unitTest.homeWork03072020.testLogin import LoginTestCase +# from python27Class.python27HomeWork.unitTest.homeWork03072020.testLogin import LoginTestCase # case1 = LoginTestCase('test_login') # suite.addTest(case1) # # 报错： AttributeError: 'LoginTestCase' object has no attribute 'test_login' diff --git a/python27Class/homeWork/unitTest/homeWork03072020/demo2/testLogin2.py b/python27HomeWork/unitTest/homeWork03072020/demo2/testLogin2.py similarity index 96% rename from python27Class/homeWork/unitTest/homeWork03072020/demo2/testLogin2.py rename to python27HomeWork/unitTest/homeWork03072020/demo2/testLogin2.py index e9796be..42d0606 100644 --- a/python27Class/homeWork/unitTest/homeWork03072020/demo2/testLogin2.py +++ b/python27HomeWork/unitTest/homeWork03072020/demo2/testLogin2.py @@ -6,10 +6,12 @@ Time: 2020/3/5 20:23 ================================= """ import unittest -from python27Class.homeWork.unitTest.homeWork03072020.demo2.ddtNew import ddt, data + from python27Class.homeWork.unitTest.homeWork03072020.demo2.login import login_check from python27Class.homeWork.unitTest.homeWork03072020.demo2.readExcel2 import login_data +from python27HomeWork.unitTest.homeWork03072020.demo2.ddtNew import ddt, data + """ # 定义测试用例类：必须继承unittest.TestCase # 定义测试用例：在测试用例类中，每一个以test开头的方法就是一条用例 diff --git a/python27Class/homeWork/unitTest/homeWork03072020/testReport/login_test_report_Beauty.html b/python27HomeWork/unitTest/homeWork03072020/testReport/login_test_report_Beauty.html similarity index 100% rename from python27Class/homeWork/unitTest/homeWork03072020/testReport/login_test_report_Beauty.html rename to python27HomeWork/unitTest/homeWork03072020/testReport/login_test_report_Beauty.html diff --git a/python27Class/homeWork/unitTest/homeWork03072020/testReport/login_test_report_HTML.html b/python27HomeWork/unitTest/homeWork03072020/testReport/login_test_report_HTML.html similarity index 100% rename from python27Class/homeWork/unitTest/homeWork03072020/testReport/login_test_report_HTML.html rename to python27HomeWork/unitTest/homeWork03072020/testReport/login_test_report_HTML.html diff --git a/python27Class/homeWork/unitTest/homeWork03102020/ddtNew.py b/python27HomeWork/unitTest/homeWork03102020/ddtNew.py similarity index 100% rename from python27Class/homeWork/unitTest/homeWork03102020/ddtNew.py rename to python27HomeWork/unitTest/homeWork03102020/ddtNew.py diff --git a/python27Class/homeWork/unitTest/homeWork03102020/login.py b/python27HomeWork/unitTest/homeWork03102020/login.py similarity index 100% rename from python27Class/homeWork/unitTest/homeWork03102020/login.py rename to python27HomeWork/unitTest/homeWork03102020/login.py diff --git a/python27Class/homeWork/unitTest/homeWork03102020/loginCaseData.xlsx b/python27HomeWork/unitTest/homeWork03102020/loginCaseData.xlsx similarity index 100% rename from python27Class/homeWork/unitTest/homeWork03102020/loginCaseData.xlsx rename to python27HomeWork/unitTest/homeWork03102020/loginCaseData.xlsx diff --git a/python27Class/homeWork/unitTest/homeWork03102020/readExcel.py b/python27HomeWork/unitTest/homeWork03102020/readExcel.py similarity index 100% rename from python27Class/homeWork/unitTest/homeWork03102020/readExcel.py rename to python27HomeWork/unitTest/homeWork03102020/readExcel.py diff --git a/python27Class/homeWork/unitTest/homeWork03102020/runTest.py b/python27HomeWork/unitTest/homeWork03102020/runTest.py similarity index 100% rename from python27Class/homeWork/unitTest/homeWork03102020/runTest.py rename to python27HomeWork/unitTest/homeWork03102020/runTest.py diff --git a/python27Class/homeWork/unitTest/homeWork03102020/testLogin.py b/python27HomeWork/unitTest/homeWork03102020/testLogin.py similarity index 96% rename from python27Class/homeWork/unitTest/homeWork03102020/testLogin.py rename to python27HomeWork/unitTest/homeWork03102020/testLogin.py index db3515c..f2ab6ca 100644 --- a/python27Class/homeWork/unitTest/homeWork03102020/testLogin.py +++ b/python27HomeWork/unitTest/homeWork03102020/testLogin.py @@ -8,10 +8,12 @@ Time: 2020/3/11 8:57 import os import unittest -from python27Class.homeWork.unitTest.homeWork03102020.login import login_check + from python27Class.homeWork.unitTest.homeWork03102020.ddtNew import ddt, data from python27Class.homeWork.unitTest.homeWork03102020.readExcel import HandleExcel +from python27HomeWork.unitTest.homeWork03102020.login import login_check + @ddt class TestLoginCase(unittest.TestCase): diff --git a/python27Class/homeWork/unitTest/homeWork03102020/testReport/loginFunctionTestReport_01.html b/python27HomeWork/unitTest/homeWork03102020/testReport/loginFunctionTestReport_01.html similarity index 100% rename from python27Class/homeWork/unitTest/homeWork03102020/testReport/loginFunctionTestReport_01.html rename to python27HomeWork/unitTest/homeWork03102020/testReport/loginFunctionTestReport_01.html diff --git a/python27Class/homeWork/unitTest/homeWork03102020/testReport/login_2020-03-11 14_06_06.html b/python27HomeWork/unitTest/homeWork03102020/testReport/login_2020-03-11 14_06_06.html similarity index 100% rename from python27Class/homeWork/unitTest/homeWork03102020/testReport/login_2020-03-11 14_06_06.html rename to python27HomeWork/unitTest/homeWork03102020/testReport/login_2020-03-11 14_06_06.html diff --git a/python27Class/homeWork/unitTest/homeWork03102020/testReport/login_2020-03-11 14_06_52.html b/python27HomeWork/unitTest/homeWork03102020/testReport/login_2020-03-11 14_06_52.html similarity index 100% rename from python27Class/homeWork/unitTest/homeWork03102020/testReport/login_2020-03-11 14_06_52.html rename to python27HomeWork/unitTest/homeWork03102020/testReport/login_2020-03-11 14_06_52.html diff --git a/python27Class/homeWork/unitTest/homeWork03102020/testReport/login_2020-03-11 14_20_21.html b/python27HomeWork/unitTest/homeWork03102020/testReport/login_2020-03-11 14_20_21.html similarity index 100% rename from python27Class/homeWork/unitTest/homeWork03102020/testReport/login_2020-03-11 14_20_21.html rename to python27HomeWork/unitTest/homeWork03102020/testReport/login_2020-03-11 14_20_21.html diff --git a/python27Class/homeWork/unitTest/homeWork03102020/testReport/login_2020-03-11 14_20_43.html b/python27HomeWork/unitTest/homeWork03102020/testReport/login_2020-03-11 14_20_43.html similarity index 100% rename from python27Class/homeWork/unitTest/homeWork03102020/testReport/login_2020-03-11 14_20_43.html rename to python27HomeWork/unitTest/homeWork03102020/testReport/login_2020-03-11 14_20_43.html diff --git a/python27Class/homeWork/unitTest/homeWork03102020/testReport/login_2020-03-12 12_12_28.html b/python27HomeWork/unitTest/homeWork03102020/testReport/login_2020-03-12 12_12_28.html similarity index 100% rename from python27Class/homeWork/unitTest/homeWork03102020/testReport/login_2020-03-12 12_12_28.html rename to python27HomeWork/unitTest/homeWork03102020/testReport/login_2020-03-12 12_12_28.html diff --git a/python27Class/homeWork/unitTest/homeWork03102020/testReport/login_2020-03-12 12_12_54.html b/python27HomeWork/unitTest/homeWork03102020/testReport/login_2020-03-12 12_12_54.html similarity index 100% rename from python27Class/homeWork/unitTest/homeWork03102020/testReport/login_2020-03-12 12_12_54.html rename to python27HomeWork/unitTest/homeWork03102020/testReport/login_2020-03-12 12_12_54.html diff --git a/python27Class/homeWork/unitTest/homeWork03102020/testReport/login_2020-03-12 12_15_20.html b/python27HomeWork/unitTest/homeWork03102020/testReport/login_2020-03-12 12_15_20.html similarity index 100% rename from python27Class/homeWork/unitTest/homeWork03102020/testReport/login_2020-03-12 12_15_20.html rename to python27HomeWork/unitTest/homeWork03102020/testReport/login_2020-03-12 12_15_20.html diff --git a/python27Class/homeWork/unitTest/homeWork03102020/testReport/login_2020-03-12 12_15_30.html b/python27HomeWork/unitTest/homeWork03102020/testReport/login_2020-03-12 12_15_30.html similarity index 100% rename from python27Class/homeWork/unitTest/homeWork03102020/testReport/login_2020-03-12 12_15_30.html rename to python27HomeWork/unitTest/homeWork03102020/testReport/login_2020-03-12 12_15_30.html