diff --git a/ConfigurationFiles/CaseConfigurationFile/CaseTemplet/Map.xml b/ConfigurationFiles/CaseConfigurationFile/CaseTemplet/Map.xml index 5088915..b207537 100644 --- a/ConfigurationFiles/CaseConfigurationFile/CaseTemplet/Map.xml +++ b/ConfigurationFiles/CaseConfigurationFile/CaseTemplet/Map.xml @@ -1,106 +1,140 @@ - - - - - <keyword value="地图,测距" /> - <rank value="3" /> +<?xml version='1.0' encoding='UTF-8'?> +<cases project='Map'> + <case name='addRangeFindingCase'> + <titles> + <title id='1' value='鍦ㄥ湴鍥句笂杩涜娴嬭窛' /> + </titles> + <keys> + <key id='1' value='鍦板浘,娴嬭窛' /> + </keys> + <ranks> + <rank id='1' value='3' /> + </ranks> <preconditions> </preconditions> <steps> - <step id="1" value="设置画线的起点后拖动鼠标" /> - <step id="2" value="在地图上画线后单击鼠标左键" /> - <step id="3" value="在地图上画线后双击鼠标左键" /> - <step id="4" value="停止画线后缩放地图" /> - <step id="5" value="设置起点后直接双击左键" /> - <step id="6" value="在不同的地图比例上画等长的线段" /> - <step id="7" value="在画好的线段上,点击“×”按钮" /> + <step id='1' value='璁剧疆鐢荤嚎鐨勮捣鐐瑰悗鎷栧姩榧犳爣' /> + <step id='2' value='鍦ㄥ湴鍥句笂鐢荤嚎鍚庡崟鍑婚紶鏍囧乏閿' /> + <step id='3' value='鍦ㄥ湴鍥句笂鐢荤嚎鍚庡弻鍑婚紶鏍囧乏閿' /> + <step id='4' value='鍋滄鐢荤嚎鍚庣缉鏀惧湴鍥' /> + <step id='5' value='璁剧疆璧风偣鍚庣洿鎺ュ弻鍑诲乏閿' /> + <step id='6' value='鍦ㄤ笉鍚岀殑鍦板浘姣斾緥涓婄敾绛夐暱鐨勭嚎娈' /> + <step id='7' value='鍦ㄧ敾濂界殑绾挎涓婏紝鐐瑰嚮鈥溍椻濇寜閽' /> </steps> - <expectations> - <expectation id="1" value="线随鼠标的移动而增长,且标注中显示的距离随鼠标的移动而改变"/> - <expectation id="2" value="还能继续画线测距,且标注中显示的距离应累加上一次定位的距离"/> - <expectation id="3" value="停止画线,且线段留在地图上"/> - <expectation id="4" value="线段随地图的缩放而改变其长度,且方框中的内容显示不变"/> - <expectation id="5" value="停止画线"/> - <expectation id="6" value="随地图缩放程度不同,其不同比例尺下画出的等长的线段在标注中显示的距离不同"/> - <expectation id="7" value="线段被清除"/> - </expectations> + <excepts> + <except id='1' value='绾块殢榧犳爣鐨勭Щ鍔ㄨ屽闀匡紝涓旀爣娉ㄤ腑鏄剧ず鐨勮窛绂婚殢榧犳爣鐨勭Щ鍔ㄨ屾敼鍙'/> + <except id='2' value='杩樿兘缁х画鐢荤嚎娴嬭窛锛屼笖鏍囨敞涓樉绀虹殑璺濈搴旂疮鍔犱笂涓娆″畾浣嶇殑璺濈'/> + <except id='3' value='鍋滄鐢荤嚎锛屼笖绾挎鐣欏湪鍦板浘涓'/> + <except id='4' value='绾挎闅忓湴鍥剧殑缂╂斁鑰屾敼鍙樺叾闀垮害锛屼笖鏂规涓殑鍐呭鏄剧ず涓嶅彉'/> + <except id='5' value='鍋滄鐢荤嚎'/> + <except id='6' value='闅忓湴鍥剧缉鏀剧▼搴︿笉鍚岋紝鍏朵笉鍚屾瘮渚嬪昂涓嬬敾鍑虹殑绛夐暱鐨勭嚎娈靛湪鏍囨敞涓樉绀虹殑璺濈涓嶅悓'/> + <except id='7' value='绾挎琚竻闄'/> + </excepts> </case> - <case name="addMapPointCase"> - <title value="查看地图*{pointName}*定位点信息" /> - <keyword value="地图,*{pointName}*,定位点" /> - <rank value="2" /> + <case name='addMapPointCase'> + <titles> + <title id='1' value='鏌ョ湅鍦板浘*{鏍囪鐐瑰悕绉皚*瀹氫綅鐐逛俊鎭' /> + </titles> + <keys> + <key id='1' value='鍦板浘,*{鏍囪鐐瑰悕绉皚*,瀹氫綅鐐' /> + </keys> + <ranks> + <rank id='1' value='2' /> + </ranks> <preconditions> - <precondition value="地图上有多个*{pointName}*定位点以及聚合点存在" /> + <precondition id='1' value='鍦板浘涓婃湁澶氫釜*{鏍囪鐐瑰悕绉皚*瀹氫綅鐐逛互鍙婅仛鍚堢偣瀛樺湪' /> </preconditions> <steps> - <step id="1" value="在地图上点击*{pointName}*的定位点" /> - <step id="2" value="在地图上点击*{pointName}*的聚合点" /> + <step id='1' value='鍦ㄥ湴鍥句笂鐐瑰嚮*{鏍囪鐐瑰悕绉皚*鐨勫畾浣嶇偣' /> + <step id='2' value='鍦ㄥ湴鍥句笂鐐瑰嚮*{鏍囪鐐瑰悕绉皚*鐨勮仛鍚堢偣' /> </steps> - <expectations> - <expectation id="1" value="能查看到该*{pointName}*的详细信息"/> - <expectation id="2" value="地图能自动缩放到能看到*{pointName}*定位点的比例"/> - </expectations> + <excepts> + <except id='1' value='鑳芥煡鐪嬪埌璇*{鏍囪鐐瑰悕绉皚*鐨勮缁嗕俊鎭'/> + <except id='2' value='鍦板浘鑳借嚜鍔ㄧ缉鏀惧埌鑳界湅鍒*{鏍囪鐐瑰悕绉皚*瀹氫綅鐐圭殑姣斾緥'/> + </excepts> </case> - <case name="addMapSearchInformationCase"> - <title value="通过*{condition}*在地图上搜索*{name}*信息" /> - <keyword value="地图,*{name}*,搜索" /> - <rank value="1" /> + <case name='addMapSearchInformationCase'> + <titles> + <title id='1' value='閫氳繃*{鎼滅储鏉′欢}*鍦ㄥ湴鍥句笂鐨*{淇℃伅}*淇℃伅杩涜鎼滅储' /> + </titles> + <keys> + <key id='1' value='鍦板浘,*{淇℃伅}*,鎼滅储' /> + </keys> + <ranks> + <rank id='1' value='1' /> + </ranks> <preconditions> - <precondition value="地图上有*{name}*信息存在" /> + <precondition id='1' value='鍦板浘涓婃湁*{淇℃伅}*淇℃伅瀛樺湪' /> </preconditions> <steps> - <step id="1" value="通过*{condition}*对*{name}*进行模糊搜索" /> - <step id="2" value="通过*{condition}*对*{name}*进行精准搜索" /> - <step id="3" value="不输入信息进行搜索" /> - <step id="4" value="输入*{name}*中都不包含的关键词进行搜索" /> + <step id='1' value='閫氳繃*{鎼滅储鏉′欢}*瀵*{淇℃伅}*杩涜妯$硦鎼滅储' /> + <step id='2' value='閫氳繃*{鎼滅储鏉′欢}*瀵*{淇℃伅}*杩涜绮惧噯鎼滅储' /> + <step id='3' value='涓嶈緭鍏ヤ俊鎭繘琛屾悳绱' /> + <step id='4' value='杈撳叆*{淇℃伅}*涓兘涓嶅寘鍚殑鍏抽敭璇嶈繘琛屾悳绱' /> </steps> - <expectations> - <expectation id="1" value="地图上显示所有符合条件的*{name}*定位点"/> - <expectation id="2" value="地图上显示*{name}*对应的定位点"/> - <expectation id="3" value="地图界面保持不变"/> - <expectation id="4" value="提示无搜索结果"/> - </expectations> + <excepts> + <except id='1' value='鍦板浘涓婃樉绀烘墍鏈夌鍚堟潯浠剁殑*{淇℃伅}*瀹氫綅鐐'/> + <except id='2' value='鍦板浘涓婃樉绀*{淇℃伅}*瀵瑰簲鐨勫畾浣嶇偣'/> + <except id='3' value='鍦板浘鐣岄潰淇濇寔涓嶅彉'/> + <except id='4' value='鎻愮ず鏃犳悳绱㈢粨鏋'/> + </excepts> </case> - <case name="addCarLocusPlaybackCase"> - <title value="回放车辆轨迹" /> - <keyword value="车辆轨迹" /> - <rank value="1" /> + <case name='addCarLocusPlaybackCase'> + <titles> + <title id='1' value='鍥炴斁杞﹁締杞ㄨ抗' /> + </titles> + <keys> + <key id='1' value='杞﹁締杞ㄨ抗' /> + </keys> + <ranks> + <rank id='1' value='1' /> + </ranks> <preconditions> - <precondition value="车辆有轨迹存在" /> + <precondition id='1' value='杞﹁締鏈夎建杩瑰瓨鍦' /> </preconditions> <steps> - <step id="1" value="查询到车辆的轨迹后点击回放或播放按钮" /> - <step id="2" value="从最小的回放速度开始依次点击到最大的播放速度" /> - <step id="3" value="在轨迹播放时点击播放按钮" /> - <step id="4" value="在轨迹播放时点击暂停按钮,再点击回放按钮" /> - <step id="5" value="在轨迹播放时点击停止按钮,再点击回放按钮" /> + <step id='1' value='鏌ヨ鍒拌溅杈嗙殑杞ㄨ抗鍚庣偣鍑诲洖鏀炬垨鎾斁鎸夐挳' /> + <step id='2' value='浠庢渶灏忕殑鍥炴斁閫熷害寮濮嬩緷娆$偣鍑诲埌鏈澶х殑鎾斁閫熷害' /> + <step id='3' value='鍦ㄨ建杩规挱鏀炬椂鐐瑰嚮鎾斁鎸夐挳' /> + <step id='4' value='鍦ㄨ建杩规挱鏀炬椂鐐瑰嚮鏆傚仠鎸夐挳锛屽啀鐐瑰嚮鍥炴斁鎸夐挳' /> + <step id='5' value='鍦ㄨ建杩规挱鏀炬椂鐐瑰嚮鍋滄鎸夐挳锛屽啀鐐瑰嚮鍥炴斁鎸夐挳' /> </steps> - <expectations> - <expectation id="1" value="地图上的车辆点以默认速度沿着轨迹在地图上移动"/> - <expectation id="2" value="车辆点的回放速度依次加快"/> - <expectation id="3" value="车辆点移动后不受任何影响,且在继续移动"/> - <expectation id="4" value="车辆点停止移动后又重新在停止的位置继续移动"/> - <expectation id="5" value="车辆点停止移动后又从起点开始重新移动"/> - </expectations> + <excepts> + <except id='1' value='鍦板浘涓婄殑杞﹁締鐐逛互榛樿閫熷害娌跨潃杞ㄨ抗鍦ㄥ湴鍥句笂绉诲姩'/> + <except id='2' value='杞﹁締鐐圭殑鍥炴斁閫熷害渚濇鍔犲揩'/> + <except id='3' value='杞﹁締鐐圭Щ鍔ㄥ悗涓嶅彈浠讳綍褰卞搷锛屼笖鍦ㄧ户缁Щ鍔'/> + <except id='4' value='杞﹁締鐐瑰仠姝㈢Щ鍔ㄥ悗鍙堥噸鏂板湪鍋滄鐨勪綅缃户缁Щ鍔'/> + <except id='5' value='杞﹁締鐐瑰仠姝㈢Щ鍔ㄥ悗鍙堜粠璧风偣寮濮嬮噸鏂扮Щ鍔'/> + </excepts> </case> - <case name="addShowLocusCase"> - <title value="地图上显示车辆轨迹点" /> - <keyword value="车辆轨迹" /> - <rank value="1" /> + <case name='mapGraphSignCase'> + <title id='1' value='鍦ㄥ湴鍥句笂缁樺埗*{鏍囪鍚嶇О}*' /> + <key id='1' value='*{鏍囪鍚嶇О}*' /> + <rank id='1' value='1' /> <preconditions> - <precondition value="车辆有轨迹存在" /> </preconditions> <steps> - <step id="1" value="依次点击*{pointType}*" /> - <step id="2" value="点击“清除轨迹”按钮" /> + <step id='1' value='鐐瑰嚮*{鍥惧舰绫诲瀷}*鍥惧舰锛屽湪鍦板浘涓粯鍒剁浉搴旂殑鍥惧舰' /> + <step id='2' value='鐐瑰嚮澶氳竟褰㈠浘褰紝鍦ㄨ捣濮嬩綅缃弻鍑荤粨鏉熺粯鍒' /> + <step id='3' value='鐐瑰嚮澶氳竟褰㈠浘褰紝寮濮嬬粯鍒跺悗锛屼笉鍙屽嚮缁撴潫缁樺埗锛岀洿鎺ョ偣鍑诲垏鎹㈠叾浠栧浘褰㈡垨鍦板浘澶栫┖鐧藉' /> + <step id='4' value='缁樺埗澶氫釜鍥惧舰' /> + <step id='5' value='缁樺埗鍥惧舰鏃讹紝妗嗙敾澶х墖鍖哄煙锛屼繚瀛樼粯鍒' /> + <step id='6' value='缁樺埗鍥惧舰鍚庯紝鍏抽棴寮圭獥鎴栧彇娑堜繚瀛樺脊绐' /> + <step id='7' value='缁樺埗鍥惧舰鍚庯紝娓呴櫎鍥惧舰' /> </steps> - <expectations> - <expectation id="1" value="地图上显示的车辆轨迹随点击的轨迹样式不同而变化"/> - <expectation id="2" value="地图上不再显示轨迹"/> - </expectations> + <excepts> + <except id='1' value='鍦板浘涓婅兘缁樺埗鍑虹浉搴旂殑鍥惧舰'/> + <except id='2' value='鑻ュ厑璁哥粯鍒讹紝鍒欐樉绀轰竴涓偣鍦ㄥ湴鍥撅紱鑻ユ棤娉曠粯鍒讹紝鍒欏簲缁欏嚭鎻愮ず'/> + <except id='3' value='澶氳竟褰㈢粯鍒跺仠姝紝涓斿湴鍥句笉浼氫笉鏂緱鍚戦紶鏍囩Щ鍔ㄦ柟鍚戠Щ鍔'/> + <except id='4' value='鍥惧舰缁樺埗鎴愬姛锛屽湴鍥句笂鏄剧ず鐩稿簲鐨勫浘褰'/> + <except id='5' value='鍥惧舰缁樺埗澶辫触锛屽苟缁欏嚭鏃犳硶缁樺埗澶氫釜鍥惧舰鐩稿叧鐨勬彁绀'/> + <except id='6' value='鑻ュ厑璁哥粯鍒讹紝鍒欏湪鍦板浘涓婃樉绀虹浉搴旂殑鍥惧舰锛涜嫢鏃犳硶缁樺埗锛屽垯搴旂粰鍑烘彁绀'/> + <except id='7' value='缁樺埗鐨勫浘褰㈡棤娉曚繚瀛'/> + <except id='8' value='缁樺埗鐨勫浘褰㈡秷澶'/> + </excepts> </case> </cases> \ No newline at end of file diff --git a/src/main/java/pres/auxiliary/work/n/testcase/TestCaseTemplet.java b/src/main/java/pres/auxiliary/work/n/testcase/TestCaseTemplet.java index 28c43a6..a166991 100644 --- a/src/main/java/pres/auxiliary/work/n/testcase/TestCaseTemplet.java +++ b/src/main/java/pres/auxiliary/work/n/testcase/TestCaseTemplet.java @@ -19,6 +19,8 @@ import org.dom4j.DocumentException; import org.dom4j.Element; import org.dom4j.io.SAXReader; +import pres.auxiliary.work.n.testcase.templet.LabelNotFoundException; + /** * <p> * <b>鏂囦欢鍚嶏細</b>TestCaseTemplet.java diff --git a/src/main/java/pres/auxiliary/work/n/testcase/TestCaseWrite.java b/src/main/java/pres/auxiliary/work/n/testcase/TestCaseWrite.java index 535c706..6fcc2eb 100644 --- a/src/main/java/pres/auxiliary/work/n/testcase/TestCaseWrite.java +++ b/src/main/java/pres/auxiliary/work/n/testcase/TestCaseWrite.java @@ -32,6 +32,9 @@ import org.dom4j.DocumentHelper; import org.dom4j.Element; import org.dom4j.io.SAXReader; +import pres.auxiliary.work.n.testcase.templet.Case; +import pres.auxiliary.work.n.testcase.templet.LabelNotFoundException; + /** * <p> * <b>鏂囦欢鍚嶏細</b>WriteTestCase.java diff --git a/src/main/java/pres/auxiliary/work/n/testcase/Case.java b/src/main/java/pres/auxiliary/work/n/testcase/templet/Case.java similarity index 95% rename from src/main/java/pres/auxiliary/work/n/testcase/Case.java rename to src/main/java/pres/auxiliary/work/n/testcase/templet/Case.java index f80b87c..2a1ff9c 100644 --- a/src/main/java/pres/auxiliary/work/n/testcase/Case.java +++ b/src/main/java/pres/auxiliary/work/n/testcase/templet/Case.java @@ -1,4 +1,4 @@ -package pres.auxiliary.work.n.testcase; +package pres.auxiliary.work.n.testcase.templet; import java.io.File; import java.util.ArrayList; @@ -11,6 +11,8 @@ import org.dom4j.DocumentException; import org.dom4j.Element; import org.dom4j.io.SAXReader; +import pres.auxiliary.work.n.testcase.IncorrectFileException; + /** * <p><b>鏂囦欢鍚嶏細</b>AbstractCase.java</p> * <p><b>鐢ㄩ旓細</b>瀹氫箟娴嬭瘯鐢ㄤ緥妯℃澘绫昏兘杩斿洖鐨勫熀鏈瓧娈碉紝鎻愪緵鍏剁浉搴旂殑get涓巗et鏂规硶锛屼絾璇ユ柟娉曚笉鍏佽鍖呭璋冪敤</p> diff --git a/src/main/java/pres/auxiliary/work/n/testcase/CaseContentException.java b/src/main/java/pres/auxiliary/work/n/testcase/templet/CaseContentException.java similarity index 91% rename from src/main/java/pres/auxiliary/work/n/testcase/CaseContentException.java rename to src/main/java/pres/auxiliary/work/n/testcase/templet/CaseContentException.java index 9ed0ab5..63e83e8 100644 --- a/src/main/java/pres/auxiliary/work/n/testcase/CaseContentException.java +++ b/src/main/java/pres/auxiliary/work/n/testcase/templet/CaseContentException.java @@ -1,4 +1,4 @@ -package pres.auxiliary.work.n.testcase; +package pres.auxiliary.work.n.testcase.templet; /** * <p><b>鏂囦欢鍚嶏細</b>CaseContentException.java</p> diff --git a/src/main/java/pres/auxiliary/work/n/testcase/DataListCase.java b/src/main/java/pres/auxiliary/work/n/testcase/templet/DataListCase.java similarity index 96% rename from src/main/java/pres/auxiliary/work/n/testcase/DataListCase.java rename to src/main/java/pres/auxiliary/work/n/testcase/templet/DataListCase.java index 5114535..a9a397e 100644 --- a/src/main/java/pres/auxiliary/work/n/testcase/DataListCase.java +++ b/src/main/java/pres/auxiliary/work/n/testcase/templet/DataListCase.java @@ -1,4 +1,4 @@ -package pres.auxiliary.work.n.testcase; +package pres.auxiliary.work.n.testcase.templet; import java.io.File; import java.io.IOException; diff --git a/src/main/java/pres/auxiliary/work/n/testcase/InformationCase.java b/src/main/java/pres/auxiliary/work/n/testcase/templet/InformationCase.java similarity index 97% rename from src/main/java/pres/auxiliary/work/n/testcase/InformationCase.java rename to src/main/java/pres/auxiliary/work/n/testcase/templet/InformationCase.java index e65d8a8..da88c15 100644 --- a/src/main/java/pres/auxiliary/work/n/testcase/InformationCase.java +++ b/src/main/java/pres/auxiliary/work/n/testcase/templet/InformationCase.java @@ -1,4 +1,4 @@ -package pres.auxiliary.work.n.testcase; +package pres.auxiliary.work.n.testcase.templet; import java.io.File; import java.util.Arrays; diff --git a/src/main/java/pres/auxiliary/work/n/testcase/LabelNotFoundException.java b/src/main/java/pres/auxiliary/work/n/testcase/templet/LabelNotFoundException.java similarity index 88% rename from src/main/java/pres/auxiliary/work/n/testcase/LabelNotFoundException.java rename to src/main/java/pres/auxiliary/work/n/testcase/templet/LabelNotFoundException.java index d29588e..a5ef89d 100644 --- a/src/main/java/pres/auxiliary/work/n/testcase/LabelNotFoundException.java +++ b/src/main/java/pres/auxiliary/work/n/testcase/templet/LabelNotFoundException.java @@ -1,4 +1,4 @@ -package pres.auxiliary.work.n.testcase; +package pres.auxiliary.work.n.testcase.templet; public class LabelNotFoundException extends RuntimeException { diff --git a/src/main/java/pres/auxiliary/work/n/testcase/LabelType.java b/src/main/java/pres/auxiliary/work/n/testcase/templet/LabelType.java similarity index 89% rename from src/main/java/pres/auxiliary/work/n/testcase/LabelType.java rename to src/main/java/pres/auxiliary/work/n/testcase/templet/LabelType.java index 2023a1a..6137636 100644 --- a/src/main/java/pres/auxiliary/work/n/testcase/LabelType.java +++ b/src/main/java/pres/auxiliary/work/n/testcase/templet/LabelType.java @@ -1,4 +1,4 @@ -package pres.auxiliary.work.n.testcase; +package pres.auxiliary.work.n.testcase.templet; /** * <p><b>鏂囦欢鍚嶏細</b>LabelType.java</p> diff --git a/src/test/java/pres/auxiliary/tool/date/TimeTest.java b/src/test/java/pres/auxiliary/tool/date/TimeTest.java index 408cb6d..c88e59b 100644 --- a/src/test/java/pres/auxiliary/tool/date/TimeTest.java +++ b/src/test/java/pres/auxiliary/tool/date/TimeTest.java @@ -29,7 +29,7 @@ public class TimeTest { time = new Time(new Date(1575387550000L)); System.out.println(time.getTime()); System.out.println("-".repeat(20)); - time = new Time(1575387800000L); + time = new Time(1585290323214L); System.out.println(time.getTime()); System.out.println("-".repeat(20)); time = new Time("2019-12-04 03:03:20"); @@ -218,7 +218,6 @@ public class TimeTest { bw.write("\"personTime\":\"" + time.getTime() + "\"\r\n"); bw.write("},\r\n"); - /* bw.write("{\r\n"); time.setNowTime(); bw.write("\"equName\":\""); @@ -275,7 +274,6 @@ public class TimeTest { time.addTime("-6.5h"); bw.write("\"personTime\":\"" + time.getTime() + "\"\r\n"); bw.write("}\r\n"); - */ bw.write("]\r\n"); bw.close(); diff --git a/src/test/java/pres/auxiliary/work/testcase/DataListCaseTest.java b/src/test/java/pres/auxiliary/work/testcase/DataListCaseTest.java index c418ab5..a03f85d 100644 --- a/src/test/java/pres/auxiliary/work/testcase/DataListCaseTest.java +++ b/src/test/java/pres/auxiliary/work/testcase/DataListCaseTest.java @@ -7,10 +7,10 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import pres.auxiliary.work.n.testcase.DataListCase; -import pres.auxiliary.work.n.testcase.LabelType; import pres.auxiliary.work.n.testcase.TestCaseTemplet; import pres.auxiliary.work.n.testcase.TestCaseWrite; +import pres.auxiliary.work.n.testcase.templet.DataListCase; +import pres.auxiliary.work.n.testcase.templet.LabelType; public class DataListCaseTest { /** diff --git a/src/test/java/pres/auxiliary/work/testcase/InformationCaseTest.java b/src/test/java/pres/auxiliary/work/testcase/InformationCaseTest.java index 8e6a4a2..d5f82d6 100644 --- a/src/test/java/pres/auxiliary/work/testcase/InformationCaseTest.java +++ b/src/test/java/pres/auxiliary/work/testcase/InformationCaseTest.java @@ -6,11 +6,11 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import pres.auxiliary.work.n.testcase.CaseContentException; -import pres.auxiliary.work.n.testcase.InformationCase; -import pres.auxiliary.work.n.testcase.InformationCase.FileRuleType; -import pres.auxiliary.work.n.testcase.InformationCase.InputRuleType; -import pres.auxiliary.work.n.testcase.InformationCase.UploadFileType; +import pres.auxiliary.work.n.testcase.templet.CaseContentException; +import pres.auxiliary.work.n.testcase.templet.InformationCase; +import pres.auxiliary.work.n.testcase.templet.InformationCase.FileRuleType; +import pres.auxiliary.work.n.testcase.templet.InformationCase.InputRuleType; +import pres.auxiliary.work.n.testcase.templet.InformationCase.UploadFileType; public class InformationCaseTest { InformationCase ic = new InformationCase(new File("ConfigurationFiles/CaseConfigurationFile/CaseTemplet/AddInformation.xml")); @@ -180,7 +180,7 @@ public class InformationCaseTest { } /** - * 娴嬭瘯{@link InformationCase#addPhoneCase(String, boolean, boolean, boolean, pres.auxiliary.work.n.testcase.InformationCase.PhoneType...)}鏂规硶 + * 娴嬭瘯{@link InformationCase#addPhoneCase(String, boolean, boolean, boolean, pres.auxiliary.work.n.testcase.templet.InformationCase.PhoneType...)}鏂规硶 */ @Test public void addPhoneCaseTest_Fixed() { @@ -188,7 +188,7 @@ public class InformationCaseTest { } /** - * 娴嬭瘯{@link InformationCase#addPhoneCase(String, boolean, boolean, boolean, pres.auxiliary.work.n.testcase.InformationCase.PhoneType...)}鏂规硶 + * 娴嬭瘯{@link InformationCase#addPhoneCase(String, boolean, boolean, boolean, pres.auxiliary.work.n.testcase.templet.InformationCase.PhoneType...)}鏂规硶 */ @Test public void addPhoneCaseTest_Moble() { @@ -196,7 +196,7 @@ public class InformationCaseTest { } /** - * 娴嬭瘯{@link InformationCase#addPhoneCase(String, boolean, boolean, boolean, pres.auxiliary.work.n.testcase.InformationCase.PhoneType...)}鏂规硶 + * 娴嬭瘯{@link InformationCase#addPhoneCase(String, boolean, boolean, boolean, pres.auxiliary.work.n.testcase.templet.InformationCase.PhoneType...)}鏂规硶 */ @Test public void addPhoneCaseTest_All() { @@ -284,7 +284,7 @@ public class InformationCaseTest { } /** - * 娴嬭瘯{@link InformationCase#addUploadFileCase(String, boolean, boolean, boolean, int, int, int, pres.auxiliary.work.n.testcase.InformationCase.UploadFileType, pres.auxiliary.work.n.testcase.InformationCase.FileRuleType...)}鏂规硶 + * 娴嬭瘯{@link InformationCase#addUploadFileCase(String, boolean, boolean, boolean, int, int, int, pres.auxiliary.work.n.testcase.templet.InformationCase.UploadFileType, pres.auxiliary.work.n.testcase.templet.InformationCase.FileRuleType...)}鏂规硶 */ @Test public void addUploadFileCaseTest_1() { @@ -292,7 +292,7 @@ public class InformationCaseTest { } /** - * 娴嬭瘯{@link InformationCase#addUploadFileCase(String, boolean, boolean, boolean, int, int, int, pres.auxiliary.work.n.testcase.InformationCase.UploadFileType, pres.auxiliary.work.n.testcase.InformationCase.FileRuleType...)}鏂规硶 + * 娴嬭瘯{@link InformationCase#addUploadFileCase(String, boolean, boolean, boolean, int, int, int, pres.auxiliary.work.n.testcase.templet.InformationCase.UploadFileType, pres.auxiliary.work.n.testcase.templet.InformationCase.FileRuleType...)}鏂规硶 */ @Test public void addUploadFileCaseTest_2() { @@ -300,7 +300,7 @@ public class InformationCaseTest { } /** - * 娴嬭瘯{@link InformationCase#addUploadFileCase(String, boolean, boolean, boolean, int, int, int, pres.auxiliary.work.n.testcase.InformationCase.UploadFileType, pres.auxiliary.work.n.testcase.InformationCase.FileRuleType...)}鏂规硶 + * 娴嬭瘯{@link InformationCase#addUploadFileCase(String, boolean, boolean, boolean, int, int, int, pres.auxiliary.work.n.testcase.templet.InformationCase.UploadFileType, pres.auxiliary.work.n.testcase.templet.InformationCase.FileRuleType...)}鏂规硶 */ @Test public void addUploadFileCaseTest_3() { @@ -308,7 +308,7 @@ public class InformationCaseTest { } /** - * 娴嬭瘯{@link InformationCase#addUploadFileCase(String, boolean, boolean, boolean, int, int, int, pres.auxiliary.work.n.testcase.InformationCase.UploadFileType, pres.auxiliary.work.n.testcase.InformationCase.FileRuleType...)}鏂规硶 + * 娴嬭瘯{@link InformationCase#addUploadFileCase(String, boolean, boolean, boolean, int, int, int, pres.auxiliary.work.n.testcase.templet.InformationCase.UploadFileType, pres.auxiliary.work.n.testcase.templet.InformationCase.FileRuleType...)}鏂规硶 */ @Test public void addUploadFileCaseTest_4() { @@ -316,7 +316,7 @@ public class InformationCaseTest { } /** - * 娴嬭瘯{@link InformationCase#addUploadFileCase(String, boolean, boolean, boolean, int, int, int, pres.auxiliary.work.n.testcase.InformationCase.UploadFileType, pres.auxiliary.work.n.testcase.InformationCase.FileRuleType...)}鏂规硶 + * 娴嬭瘯{@link InformationCase#addUploadFileCase(String, boolean, boolean, boolean, int, int, int, pres.auxiliary.work.n.testcase.templet.InformationCase.UploadFileType, pres.auxiliary.work.n.testcase.templet.InformationCase.FileRuleType...)}鏂规硶 */ @Test public void addUploadFileCaseTest_5() { diff --git a/src/test/java/pres/auxiliary/work/testcase/ProgramWriteTestCaseDemo.java b/src/test/java/pres/auxiliary/work/testcase/ProgramWriteTestCaseDemo.java index eb2e3e4..00e8b0b 100644 --- a/src/test/java/pres/auxiliary/work/testcase/ProgramWriteTestCaseDemo.java +++ b/src/test/java/pres/auxiliary/work/testcase/ProgramWriteTestCaseDemo.java @@ -10,12 +10,12 @@ import org.testng.annotations.BeforeGroups; import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; -import pres.auxiliary.work.n.testcase.InformationCase; -import pres.auxiliary.work.n.testcase.LabelType; import pres.auxiliary.work.n.testcase.MarkColorsType; import pres.auxiliary.work.n.testcase.TestCaseTemplet; import pres.auxiliary.work.n.testcase.TestCaseWrite; -import pres.auxiliary.work.n.testcase.InformationCase.InputRuleType; +import pres.auxiliary.work.n.testcase.templet.InformationCase; +import pres.auxiliary.work.n.testcase.templet.LabelType; +import pres.auxiliary.work.n.testcase.templet.InformationCase.InputRuleType; public class ProgramWriteTestCaseDemo { /** diff --git a/src/test/java/pres/auxiliary/work/testcase/WriteTestCaseTest.java b/src/test/java/pres/auxiliary/work/testcase/WriteTestCaseTest.java index 5523ce4..903a974 100644 --- a/src/test/java/pres/auxiliary/work/testcase/WriteTestCaseTest.java +++ b/src/test/java/pres/auxiliary/work/testcase/WriteTestCaseTest.java @@ -12,12 +12,12 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import pres.auxiliary.work.n.testcase.FieldType; -import pres.auxiliary.work.n.testcase.InformationCase; -import pres.auxiliary.work.n.testcase.LabelType; import pres.auxiliary.work.n.testcase.MarkColorsType; import pres.auxiliary.work.n.testcase.TestCaseTemplet; import pres.auxiliary.work.n.testcase.TestCaseWrite; import pres.auxiliary.work.n.testcase.TestCaseWrite.CaseMark; +import pres.auxiliary.work.n.testcase.templet.InformationCase; +import pres.auxiliary.work.n.testcase.templet.LabelType; /** * <p>