diff --git a/python27Class/LearningNotesTXT/Python/flora_0204_homework.txt b/python27Class/pythonLearningNotes/Python/flora_0204_homework.txt similarity index 100% rename from python27Class/LearningNotesTXT/Python/flora_0204_homework.txt rename to python27Class/pythonLearningNotes/Python/flora_0204_homework.txt diff --git a/python27Class/LearningNotesTXT/Python/flora_0206_notes.txt b/python27Class/pythonLearningNotes/Python/flora_0206_notes.txt similarity index 100% rename from python27Class/LearningNotesTXT/Python/flora_0206_notes.txt rename to python27Class/pythonLearningNotes/Python/flora_0206_notes.txt diff --git a/python27Class/LearningNotesTXT/Python/flora_0208_notes.txt b/python27Class/pythonLearningNotes/Python/flora_0208_notes.txt similarity index 100% rename from python27Class/LearningNotesTXT/Python/flora_0208_notes.txt rename to python27Class/pythonLearningNotes/Python/flora_0208_notes.txt diff --git a/python27Class/LearningNotesTXT/Python/flora_0211_notes.txt b/python27Class/pythonLearningNotes/Python/flora_0211_notes.txt similarity index 100% rename from python27Class/LearningNotesTXT/Python/flora_0211_notes.txt rename to python27Class/pythonLearningNotes/Python/flora_0211_notes.txt diff --git a/python27Class/LearningNotesTXT/Python/flora_0213_notes.txt b/python27Class/pythonLearningNotes/Python/flora_0213_notes.txt similarity index 100% rename from python27Class/LearningNotesTXT/Python/flora_0213_notes.txt rename to python27Class/pythonLearningNotes/Python/flora_0213_notes.txt diff --git a/python27Class/LearningNotesTXT/Python/flora_0215_notes.txt b/python27Class/pythonLearningNotes/Python/flora_0215_notes.txt similarity index 100% rename from python27Class/LearningNotesTXT/Python/flora_0215_notes.txt rename to python27Class/pythonLearningNotes/Python/flora_0215_notes.txt diff --git a/python27Class/LearningNotesTXT/Python/flora_0218_notes.txt b/python27Class/pythonLearningNotes/Python/flora_0218_notes.txt similarity index 100% rename from python27Class/LearningNotesTXT/Python/flora_0218_notes.txt rename to python27Class/pythonLearningNotes/Python/flora_0218_notes.txt diff --git a/python27Class/LearningNotesTXT/Python/flora_0220_notes.txt b/python27Class/pythonLearningNotes/Python/flora_0220_notes.txt similarity index 100% rename from python27Class/LearningNotesTXT/Python/flora_0220_notes.txt rename to python27Class/pythonLearningNotes/Python/flora_0220_notes.txt diff --git a/python27Class/LearningNotesTXT/Python/flora_0222_notes.txt b/python27Class/pythonLearningNotes/Python/flora_0222_notes.txt similarity index 100% rename from python27Class/LearningNotesTXT/Python/flora_0222_notes.txt rename to python27Class/pythonLearningNotes/Python/flora_0222_notes.txt diff --git a/python27Class/LearningNotesTXT/Python/flora_0225_notes.txt b/python27Class/pythonLearningNotes/Python/flora_0225_notes.txt similarity index 100% rename from python27Class/LearningNotesTXT/Python/flora_0225_notes.txt rename to python27Class/pythonLearningNotes/Python/flora_0225_notes.txt diff --git a/python27Class/LearningNotesTXT/Python/flora_0227_notes.txt b/python27Class/pythonLearningNotes/Python/flora_0227_notes.txt similarity index 100% rename from python27Class/LearningNotesTXT/Python/flora_0227_notes.txt rename to python27Class/pythonLearningNotes/Python/flora_0227_notes.txt diff --git a/python27Class/LearningNotesTXT/Python/flora_0229_notes.txt b/python27Class/pythonLearningNotes/Python/flora_0229_notes.txt similarity index 100% rename from python27Class/LearningNotesTXT/Python/flora_0229_notes.txt rename to python27Class/pythonLearningNotes/Python/flora_0229_notes.txt diff --git a/python27Class/LearningNotesTXT/Python/flora_0303_notes.txt b/python27Class/pythonLearningNotes/Python/flora_0303_notes.txt similarity index 100% rename from python27Class/LearningNotesTXT/Python/flora_0303_notes.txt rename to python27Class/pythonLearningNotes/Python/flora_0303_notes.txt diff --git a/python27Class/class03052020/README.txt b/python27Class/unitTest/class03052020/README.txt similarity index 100% rename from python27Class/class03052020/README.txt rename to python27Class/unitTest/class03052020/README.txt diff --git a/python27Class/class03052020/login.py b/python27Class/unitTest/class03052020/login.py similarity index 100% rename from python27Class/class03052020/login.py rename to python27Class/unitTest/class03052020/login.py diff --git a/python27Class/class03052020/runTest.py b/python27Class/unitTest/class03052020/runTest.py similarity index 97% rename from python27Class/class03052020/runTest.py rename to python27Class/unitTest/class03052020/runTest.py index e1c56dc..71b658a 100644 --- a/python27Class/class03052020/runTest.py +++ b/python27Class/unitTest/class03052020/runTest.py @@ -33,7 +33,7 @@ suite = unittest.TestSuite() # suite.addTest(loader.discover(r'E:\PycharmProject\PythonClassChy\python27Class')) # 第四种：一条条去加载 -from python27Class.class03052020.testCase import LoginTestCase +from python27Class.unitTest.class03052020.testCase import LoginTestCase case1 = LoginTestCase('test_login_pass') suite.addTest(case1) diff --git a/python27Class/class03052020/testCase.py b/python27Class/unitTest/class03052020/testCase.py similarity index 97% rename from python27Class/class03052020/testCase.py rename to python27Class/unitTest/class03052020/testCase.py index d0f8c2e..d6b5d57 100644 --- a/python27Class/class03052020/testCase.py +++ b/python27Class/unitTest/class03052020/testCase.py @@ -7,7 +7,7 @@ Time: 2020/3/5 20:23 """ import unittest -from python27Class.class03052020.login import login_check +from python27Class.unitTest.class03052020.login import login_check """ # 定义测试用例类：必须继承unittest.TestCase diff --git a/python27Class/class03072020/README.txt b/python27Class/unitTest/class03072020/README.txt similarity index 100% rename from python27Class/class03072020/README.txt rename to python27Class/unitTest/class03072020/README.txt diff --git a/python27Class/class03072020/demo1/noteDemo1.txt b/python27Class/unitTest/class03072020/demo1/noteDemo1.txt similarity index 100% rename from python27Class/class03072020/demo1/noteDemo1.txt rename to python27Class/unitTest/class03072020/demo1/noteDemo1.txt diff --git a/python27Class/class03072020/demo1/registerPage.py b/python27Class/unitTest/class03072020/demo1/registerPage.py similarity index 100% rename from python27Class/class03072020/demo1/registerPage.py rename to python27Class/unitTest/class03072020/demo1/registerPage.py diff --git a/python27Class/class03072020/demo1/runTest.py b/python27Class/unitTest/class03072020/demo1/runTest.py similarity index 94% rename from python27Class/class03072020/demo1/runTest.py rename to python27Class/unitTest/class03072020/demo1/runTest.py index a6bfbd6..7be9d8d 100644 --- a/python27Class/class03072020/demo1/runTest.py +++ b/python27Class/unitTest/class03072020/demo1/runTest.py @@ -10,7 +10,7 @@ import unittest from BeautifulReport import BeautifulReport -from python27Class.class03072020.demo1.testRegister import RegisterTestCase +from python27Class.unitTest.class03072020.demo1.testRegister import RegisterTestCase """ 第一步：创建测试套件 diff --git a/python27Class/class03072020/demo1/testRegister.py b/python27Class/unitTest/class03072020/demo1/testRegister.py similarity index 90% rename from python27Class/class03072020/demo1/testRegister.py rename to python27Class/unitTest/class03072020/demo1/testRegister.py index f938d8b..3c7f40a 100644 --- a/python27Class/class03072020/demo1/testRegister.py +++ b/python27Class/unitTest/class03072020/demo1/testRegister.py @@ -7,7 +7,7 @@ Time: 2020/3/7 9:47 """ import unittest -from python27Class.class03072020.demo1.registerPage import register +from python27Class.unitTest.class03072020.demo1.registerPage import register class RegisterTestCase(unittest.TestCase): diff --git a/python27Class/class03072020/demo2/ddtNew.py b/python27Class/unitTest/class03072020/demo2/ddtNew.py similarity index 100% rename from python27Class/class03072020/demo2/ddtNew.py rename to python27Class/unitTest/class03072020/demo2/ddtNew.py diff --git a/python27Class/class03072020/demo2/noteDemo2.txt b/python27Class/unitTest/class03072020/demo2/noteDemo2.txt similarity index 100% rename from python27Class/class03072020/demo2/noteDemo2.txt rename to python27Class/unitTest/class03072020/demo2/noteDemo2.txt diff --git a/python27Class/class03072020/demo2/registerPage.py b/python27Class/unitTest/class03072020/demo2/registerPage.py similarity index 100% rename from python27Class/class03072020/demo2/registerPage.py rename to python27Class/unitTest/class03072020/demo2/registerPage.py diff --git a/python27Class/class03102020/demo2/runTest.py b/python27Class/unitTest/class03072020/demo2/runTest.py similarity index 92% rename from python27Class/class03102020/demo2/runTest.py rename to python27Class/unitTest/class03072020/demo2/runTest.py index 03c9686..5ed79c3 100644 --- a/python27Class/class03102020/demo2/runTest.py +++ b/python27Class/unitTest/class03072020/demo2/runTest.py @@ -10,8 +10,6 @@ import unittest from BeautifulReport import BeautifulReport -from python27Class.class03072020.demo1.testRegister import RegisterTestCase - """ 第一步：创建测试套件并加载测试用例 """ diff --git a/python27Class/class03072020/demo2/testRegister.py b/python27Class/unitTest/class03072020/demo2/testRegister.py similarity index 92% rename from python27Class/class03072020/demo2/testRegister.py rename to python27Class/unitTest/class03072020/demo2/testRegister.py index f86cd8c..fa1897f 100644 --- a/python27Class/class03072020/demo2/testRegister.py +++ b/python27Class/unitTest/class03072020/demo2/testRegister.py @@ -7,9 +7,11 @@ Time: 2020/3/7 9:47 """ import unittest -from python27Class.class03072020.demo2.registerPage import register from python27Class.class03072020.demo2.ddtNew import ddt, data +from python27Class.unitTest.class03072020.demo2.registerPage import register + + @ddt class RegisterTestCase(unittest.TestCase): cases = [ diff --git a/python27Class/class03072020/demo2/testReport/register_beautiful_report.html b/python27Class/unitTest/class03072020/demo2/testReport/register_beautiful_report.html similarity index 100% rename from python27Class/class03072020/demo2/testReport/register_beautiful_report.html rename to python27Class/unitTest/class03072020/demo2/testReport/register_beautiful_report.html diff --git a/python27Class/class03072020/demo3/case.xlsx b/python27Class/unitTest/class03072020/demo3/case.xlsx similarity index 100% rename from python27Class/class03072020/demo3/case.xlsx rename to python27Class/unitTest/class03072020/demo3/case.xlsx diff --git a/python27Class/class03072020/demo3/noteDemo3.txt b/python27Class/unitTest/class03072020/demo3/noteDemo3.txt similarity index 100% rename from python27Class/class03072020/demo3/noteDemo3.txt rename to python27Class/unitTest/class03072020/demo3/noteDemo3.txt diff --git a/python27Class/class03072020/demo3/pythonExcel.py b/python27Class/unitTest/class03072020/demo3/pythonExcel.py similarity index 100% rename from python27Class/class03072020/demo3/pythonExcel.py rename to python27Class/unitTest/class03072020/demo3/pythonExcel.py diff --git a/python27Class/class03102020/README.txt b/python27Class/unitTest/class03102020/README.txt similarity index 100% rename from python27Class/class03102020/README.txt rename to python27Class/unitTest/class03102020/README.txt diff --git a/python27Class/class03102020/demo1/readExcelNotClass.py b/python27Class/unitTest/class03102020/demo1/readExcelNotClass.py similarity index 100% rename from python27Class/class03102020/demo1/readExcelNotClass.py rename to python27Class/unitTest/class03102020/demo1/readExcelNotClass.py diff --git a/python27Class/class03102020/demo2/cases.xlsx b/python27Class/unitTest/class03102020/demo2/cases.xlsx similarity index 100% rename from python27Class/class03102020/demo2/cases.xlsx rename to python27Class/unitTest/class03102020/demo2/cases.xlsx diff --git a/python27Class/class03102020/demo2/ddtNew.py b/python27Class/unitTest/class03102020/demo2/ddtNew.py similarity index 100% rename from python27Class/class03102020/demo2/ddtNew.py rename to python27Class/unitTest/class03102020/demo2/ddtNew.py diff --git a/python27Class/class03102020/demo2/readExcel.py b/python27Class/unitTest/class03102020/demo2/readExcel.py similarity index 100% rename from python27Class/class03102020/demo2/readExcel.py rename to python27Class/unitTest/class03102020/demo2/readExcel.py diff --git a/python27Class/class03102020/demo2/registerPage.py b/python27Class/unitTest/class03102020/demo2/registerPage.py similarity index 100% rename from python27Class/class03102020/demo2/registerPage.py rename to python27Class/unitTest/class03102020/demo2/registerPage.py diff --git a/python27Class/class03072020/demo2/runTest.py b/python27Class/unitTest/class03102020/demo2/runTest.py similarity index 92% rename from python27Class/class03072020/demo2/runTest.py rename to python27Class/unitTest/class03102020/demo2/runTest.py index 03c9686..5ed79c3 100644 --- a/python27Class/class03072020/demo2/runTest.py +++ b/python27Class/unitTest/class03102020/demo2/runTest.py @@ -10,8 +10,6 @@ import unittest from BeautifulReport import BeautifulReport -from python27Class.class03072020.demo1.testRegister import RegisterTestCase - """ 第一步：创建测试套件并加载测试用例 """ diff --git a/python27Class/class03102020/demo2/testRegister.py b/python27Class/unitTest/class03102020/demo2/testRegister.py similarity index 94% rename from python27Class/class03102020/demo2/testRegister.py rename to python27Class/unitTest/class03102020/demo2/testRegister.py index 0169084..046c621 100644 --- a/python27Class/class03102020/demo2/testRegister.py +++ b/python27Class/unitTest/class03102020/demo2/testRegister.py @@ -7,9 +7,11 @@ Time: 2020/3/7 9:47 """ import unittest -from python27Class.class03102020.demo2.registerPage import register -from python27Class.class03102020.demo2.ddtNew import ddt, data from python27Class.class03102020.demo2.readExcel import HandleExcel +from python27Class.class03102020.demo2.registerPage import register + +from python27Class.unitTest.class03102020.demo2.ddtNew import ddt, data + @ddt class RegisterTestCase(unittest.TestCase): diff --git a/python27Class/class03102020/demo2/testReport/register_beautiful_report.html b/python27Class/unitTest/class03102020/demo2/testReport/register_beautiful_report.html similarity index 100% rename from python27Class/class03102020/demo2/testReport/register_beautiful_report.html rename to python27Class/unitTest/class03102020/demo2/testReport/register_beautiful_report.html